Componentizing GcmProfileService.

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/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/api/gcm/gcm_api.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/gcm_profile_service.h"
 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
+#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
+#include "chrome/browser/signin/signin_manager_factory.h"
+#include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
+#include "chrome/common/channel_info.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/gcm_driver/fake_gcm_app_handler.h"
 #include "components/gcm_driver/fake_gcm_client.h"
 #include "components/gcm_driver/fake_gcm_client_factory.h"
 #include "components/gcm_driver/gcm_client_factory.h"
 #include "components/gcm_driver/gcm_driver.h"
+#include "components/gcm_driver/gcm_profile_service.h"
 #include "components/keyed_service/core/keyed_service.h"
+#include "components/signin/core/browser/signin_manager.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/uninstall_reason.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest.h"
 #include "extensions/common/manifest_constants.h"
 #include "extensions/common/permissions/api_permission.h"
@@ skipping 134 matching lines @@
   instance_id::InstanceID::Result delete_id_result_;
   bool app_handler_count_drop_to_zero_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeExtensionGCMAppHandler);
 };
 
 class ExtensionGCMAppHandlerTest : public testing::Test {
  public:
   static scoped_ptr<KeyedService> BuildGCMProfileService(
       content::BrowserContext* context) {
+    Profile* profile = Profile::FromBrowserContext(context);
+    scoped_refptr<base::SequencedTaskRunner> ui_thread =
+        content::BrowserThread::GetMessageLoopProxyForThread(
+            content::BrowserThread::UI);
+    scoped_refptr<base::SequencedTaskRunner> io_thread =
+        content::BrowserThread::GetMessageLoopProxyForThread(
+            content::BrowserThread::IO);
+    base::SequencedWorkerPool* worker_pool =
+        content::BrowserThread::GetBlockingPool();
+    scoped_refptr<base::SequencedTaskRunner> blocking_task_runner(
+        worker_pool->GetSequencedTaskRunnerWithShutdownBehavior(
+            worker_pool->GetSequenceToken(),
+            base::SequencedWorkerPool::SKIP_ON_SHUTDOWN));
     return make_scoped_ptr(new gcm::GCMProfileService(
-        Profile::FromBrowserContext(context),
-        scoped_ptr<gcm::GCMClientFactory>(new gcm::FakeGCMClientFactory(
-            content::BrowserThread::GetMessageLoopProxyForThread(
-                content::BrowserThread::UI),
-            content::BrowserThread::GetMessageLoopProxyForThread(
-                content::BrowserThread::IO)))));
+        profile->GetPrefs(), profile->GetPath(), profile->GetRequestContext(),
+        chrome::GetChannel(),
+        scoped_ptr<ProfileIdentityProvider>(new ProfileIdentityProvider(
+            SigninManagerFactory::GetForProfile(profile),
+            ProfileOAuth2TokenServiceFactory::GetForProfile(profile),
+            LoginUIServiceFactory::GetShowLoginPopupCallbackForProfile(
+                profile))),
+        scoped_ptr<gcm::GCMClientFactory>(

[dcheng, 2015/10/30 15:44:14]

Nit: make_scoped_ptr to take advantage of type deduction.

[Jitu( very slow this week), 2015/11/02 06:50:55]

Done.

+            new gcm::FakeGCMClientFactory(ui_thread, io_thread)),
+        ui_thread, io_thread, blocking_task_runner));
   }
 
   ExtensionGCMAppHandlerTest()
       : extension_service_(NULL),
         registration_result_(gcm::GCMClient::UNKNOWN_ERROR),
         unregistration_result_(gcm::GCMClient::UNKNOWN_ERROR) {
   }
 
   ~ExtensionGCMAppHandlerTest() override {}
 
@@ skipping 255 matching lines @@
 
   // App handler is removed when the extension is updated to the version that
   // has GCM permission removed.
   UpdateExtension(extension.get(), "good2.crx");
   waiter()->PumpUILoop();
   EXPECT_TRUE(gcm_app_handler()->app_handler_count_drop_to_zero());
   EXPECT_FALSE(HasAppHandlers(extension->id()));
 }
 
 }  // namespace extensions