Make GCMProfileService own GCMDriver, instead of deriving from it

chrome/browser/extensions/extension_gcm_app_handler_unittest.cc

 // Copyright 2014 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 "chrome/browser/extensions/extension_gcm_app_handler.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_service.h"
 #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_driver.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"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/gcm_driver/gcm_client_factory.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_browser_thread_bundle.h"
@@ skipping 124 matching lines @@
   Waiter* waiter_;
   gcm::GCMClient::Result unregistration_result_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeExtensionGCMAppHandler);
 };
 
 class ExtensionGCMAppHandlerTest : public testing::Test {
  public:
   static KeyedService* BuildGCMProfileService(
       content::BrowserContext* context) {
-    return new gcm::GCMProfileService(static_cast<Profile*>(context));
+    return new gcm::GCMProfileService(
+        Profile::FromBrowserContext(context),
+        scoped_ptr<gcm::GCMClientFactory>(
+            new gcm::FakeGCMClientFactory(gcm::FakeGCMClient::NO_DELAY_START)));
   }
 
   ExtensionGCMAppHandlerTest()
       : extension_service_(NULL),
         registration_result_(gcm::GCMClient::UNKNOWN_ERROR),
         unregistration_result_(gcm::GCMClient::UNKNOWN_ERROR) {
   }
 
   virtual ~ExtensionGCMAppHandlerTest() {
   }
@@ skipping 21 matching lines @@
     TestExtensionSystem* extension_system(
         static_cast<TestExtensionSystem*>(ExtensionSystem::Get(profile())));
     extension_system->CreateExtensionService(
         CommandLine::ForCurrentProcess(), base::FilePath(), false);
     extension_service_ = extension_system->Get(profile())->extension_service();
 
     // Enable GCM such that tests could be run on all channels.
     profile()->GetPrefs()->SetBoolean(prefs::kGCMChannelEnabled, true);
 
     // Create GCMProfileService that talks with fake GCMClient.
-    gcm::GCMProfileService* gcm_profile_service =
-        static_cast<gcm::GCMProfileService*>(
-            gcm::GCMProfileServiceFactory::GetInstance()->
-                SetTestingFactoryAndUse(
-                    profile(),
-                    &ExtensionGCMAppHandlerTest::BuildGCMProfileService));
-    scoped_ptr<gcm::GCMClientFactory> gcm_client_factory(
-        new gcm::FakeGCMClientFactory(gcm::FakeGCMClient::NO_DELAY_START));
-    gcm_profile_service->Initialize(gcm_client_factory.Pass());
+    gcm::GCMProfileServiceFactory::GetInstance()->SetTestingFactoryAndUse(
+        profile(), &ExtensionGCMAppHandlerTest::BuildGCMProfileService);
 
     // Create a fake version of ExtensionGCMAppHandler.
     gcm_app_handler_.reset(new FakeExtensionGCMAppHandler(profile(), &waiter_));
   }
 
   virtual void TearDown() OVERRIDE {
 #if defined(OS_CHROMEOS)
     test_user_manager_.reset();
 #endif
 
@@ skipping 50 matching lines @@
     waiter_.PumpIOLoop();
   }
 
   void SignOut() {
     signin_manager_->SignOut();
     waiter_.PumpIOLoop();
   }
 
   void Register(const std::string& app_id,
                 const std::vector<std::string>& sender_ids) {
-    GetGCMProfileService()->Register(
+    GetGCMDriver()->Register(
         app_id,
         sender_ids,
         base::Bind(&ExtensionGCMAppHandlerTest::RegisterCompleted,
                    base::Unretained(this)));
   }
 
   void RegisterCompleted(const std::string& registration_id,
                          gcm::GCMClient::Result result) {
     registration_result_ = result;
     waiter_.SignalCompleted();
   }
 
-  gcm::GCMProfileService* GetGCMProfileService() const {
-    return gcm::GCMProfileServiceFactory::GetForProfile(profile());
+  gcm::GCMDriver* GetGCMDriver() const {
+    return gcm::GCMProfileServiceFactory::GetForProfile(profile())->driver();
   }
 
   bool HasAppHandlers(const std::string& app_id) const {
-    return GetGCMProfileService()->app_handlers().count(app_id);
+    return GetGCMDriver()->app_handlers().count(app_id);
   }
 
   Profile* profile() const { return profile_.get(); }
   Waiter* waiter() { return &waiter_; }
   FakeExtensionGCMAppHandler* gcm_app_handler() const {
     return gcm_app_handler_.get();
   }
   gcm::GCMClient::Result registration_result() const {
     return registration_result_;
   }
@@ skipping 61 matching lines @@
   EXPECT_EQ(gcm::GCMClient::SUCCESS, registration_result());
 
   // Unregistration should be triggered when the extension is uninstalled.
   UninstallExtension(extension);
   waiter()->WaitUntilCompleted();
   EXPECT_EQ(gcm::GCMClient::SUCCESS,
             gcm_app_handler()->unregistration_result());
 }
 
 }  // namespace extensions