Removes an unused variable; also refactors to support an up-coming
googlemock change.


git-svn-id: http://googletest.googlecode.com/svn/trunk@640 861a406c-534a-0410-8894-cb66d6ee9925
3 files changed