Fix bad merge in ClientSocketPoolBaseHelper.
Fix bad merge in ClientSocketPoolBaseHelper.

BUG=none
TEST=none

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

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

Former-commit-id: 92c8707737a349809964a8d54808646b9a1c99b5
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