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