Fix problems with my previous patch (r70105) with gmock.
Fix problems with my previous patch (r70105) with gmock.

TBR=joi

Review URL: http://codereview.chromium.org/6010005

git-svn-id: http://src.chromium.org/svn/trunk/src@70138 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

Former-commit-id: 86ae0735fd1bf825ad51bc8f756b305ed87674cb
meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser