Rename GCMClientMock to FakeGCMClient

chrome/browser/extensions/extension_gcm_app_handler_unittest.cc

Index: chrome/browser/extensions/extension_gcm_app_handler_unittest.cc
diff --git a/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc b/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc
index 38cefed8ab81274674523dcb8e1923d86e73049e..8e2b980ed74911604674af27c3f3b80fc7cf28e8 100644
--- a/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc
+++ b/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc
@@ -20,9 +20,9 @@
 #include "chrome/browser/extensions/test_extension_service.h"
 #include "chrome/browser/extensions/test_extension_system.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/services/gcm/fake_gcm_client.h"
 #include "chrome/browser/services/gcm/fake_gcm_client_factory.h"
 #include "chrome/browser/services/gcm/fake_signin_manager.h"
-#include "chrome/browser/services/gcm/gcm_client_mock.h"
 #include "chrome/browser/services/gcm/gcm_profile_service.h"
 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
@@ -216,7 +216,7 @@ class ExtensionGCMAppHandlerTest : public testing::Test {
                     profile(),
                     &ExtensionGCMAppHandlerTest::BuildGCMProfileService));
     scoped_ptr<gcm::GCMClientFactory> gcm_client_factory(
-        new gcm::FakeGCMClientFactory(gcm::GCMClientMock::NO_DELAY_START));
+        new gcm::FakeGCMClientFactory(gcm::FakeGCMClient::NO_DELAY_START));
     gcm_profile_service->Initialize(gcm_client_factory.Pass());
 
     // Create a fake version of ExtensionGCMAppHandler.