[GCM] Reland: Introduce GCMClientFactory to create GCMClient for GCMProfileService

chrome/browser/services/gcm/gcm_profile_service_unittest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/leak_annotations.h"
 #include "base/prefs/pref_service.h"
 #include "base/run_loop.h"
 #include "chrome/browser/extensions/state_store.h"
 #include "chrome/browser/extensions/test_extension_service.h"
 #include "chrome/browser/extensions/test_extension_system.h"
+#include "chrome/browser/services/gcm/gcm_client_factory.h"
 #include "chrome/browser/services/gcm/gcm_client_mock.h"
 #include "chrome/browser/services/gcm/gcm_event_router.h"
 #include "chrome/browser/services/gcm/gcm_profile_service.h"
 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
 #include "chrome/browser/signin/fake_signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/extensions/features/feature_channel.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
@@ skipping 103 matching lines @@
         SigninManagerFactory::GetForProfile(profile());
     signin_manager->SetAuthenticatedUsername(kTestingUsername);
 
     // Encryptor ends up needing access to the keychain on OS X. So use the mock
     // keychain to prevent prompts.
 #if defined(OS_MACOSX)
     Encryptor::UseMockKeychain(true);
 #endif
 
     // Mock a GCMClient.
-    GCMClient::SetTestingFactory(&GCMProfileServiceTest::BuildGCMClient);
+    GCMClientFactory::SetTestingFactory(&GCMProfileServiceTest::BuildGCMClient);
 
     // Mock a GCMEventRouter.
     gcm_event_router_mock_.reset(new GCMEventRouterMock(this));
 
     // Set |gps_testing_delegate_| for it to be picked up by
     // BuildGCMProfileService and pass it to GCMProfileService.
     gps_testing_delegate_ = this;
 
     // This will create GCMProfileService that causes check-in to be initiated.
     GCMProfileService::enable_gcm_for_testing_ = true;
@@ skipping 88 matching lines @@
   scoped_ptr<chromeos::ScopedTestUserManager> test_user_manager_;
 #endif
 
  private:
   static GCMProfileService::TestingDelegate* gps_testing_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(GCMProfileServiceTest);
 };
 
 static GCMClientMock* GetGCMClientMock() {
-  return static_cast<GCMClientMock*>(GCMClient::Get());
+  return static_cast<GCMClientMock*>(GCMClientFactory::GetClient());
 }
 
 class ScopedGCMClientMockSimulateServerError {
  public:
   ScopedGCMClientMockSimulateServerError() {
     GetGCMClientMock()->set_simulate_server_error(true);
   }
 
   ~ScopedGCMClientMockSimulateServerError() {
     GetGCMClientMock()->set_simulate_server_error(false);
@@ skipping 442 matching lines @@
 
 TEST_F(GCMProfileServiceTest, MessagesDeleted) {
   GetGCMClientMock()->DeleteMessages(kTestingUsername, kTestingAppId);
   WaitForCompleted();
   EXPECT_EQ(GCMEventRouterMock::MESSAGES_DELETED_EVENT,
             gcm_event_router_mock_->received_event());
   EXPECT_EQ(kTestingAppId, gcm_event_router_mock_->app_id());
 }
 
 }  // namespace gcm