Componentizing GcmProfileService.

chrome/browser/services/gcm/gcm_profile_service_factory.cc

Index: chrome/browser/services/gcm/gcm_profile_service_factory.cc
diff --git a/chrome/browser/services/gcm/gcm_profile_service_factory.cc b/chrome/browser/services/gcm/gcm_profile_service_factory.cc
index 561a2fd272166a24798efb71ae4edd7426ea994b..b44d3b0dcc1773bdfdd6ea44384e04ddae343f02 100644
--- a/chrome/browser/services/gcm/gcm_profile_service_factory.cc
+++ b/chrome/browser/services/gcm/gcm_profile_service_factory.cc
@@ -7,10 +7,14 @@
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/services/gcm/gcm_profile_service.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
+#include "chrome/common/channel_info.h"
+#include "components/gcm_driver/gcm_profile_service.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
+#include "components/signin/core/browser/profile_identity_provider.h"
+#include "components/signin/core/browser/signin_manager.h"
+#include "content/public/browser/browser_thread.h"
 
 #if !defined(OS_ANDROID)
 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
@@ -51,12 +55,31 @@ GCMProfileServiceFactory::~GCMProfileServiceFactory() {
 
 KeyedService* GCMProfileServiceFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
+  Profile* profile = Profile::FromBrowserContext(context);
+  CHECK(!profile->IsOffTheRecord());

[fgorski, 2015/10/30 13:19:05]

Where did this come from?
GCM is enabled in incognito. Was there a line someplace else you moved here, or
did you put it in by mistake?

[blundell, 2015/10/30 13:29:07]

Hmm, that's very strange. It used to be in the GCMProfileService constructor, so
the change made here is correct AFAICT. I don't know how to square that fact
with line 88 of this file below.

[droger, 2015/10/30 13:38:30]

I agree that the CL is fine in the sense that it does not change the existing
logic.

However, that logic indeed seems inconsistent and my hunch is that GCM is not
actually used in incognito.
We should either remove the DCHECK or remove the GetBrowserContextToUse()
method.
Let us know if you have a strong opinion.

In doubt, removing the method is better, but we may also consider this to be out
of scope of the CL.

[Bernhard Bauer, 2015/10/30 13:38:45]

Peter added this to investigate https://crbug.com/437827.

Also, this is now a CHECK instead of a DCHECK.

[fgorski, 2015/10/30 13:40:36]

Well in that case, thanks for bringing that to my attention... looks like we
cannot run GCM on debug builds and nobody cares...

Note, Original says DCHECK, not CHECK, which was recently removed from Android.

And I'll ask jianli@ to comment and perhaps remove the line altogether.

[blundell, 2015/10/30 13:44:48]

In any case, this should definitely be a DCHECK to match the old code -- thanks
for the catch. jitu@, can you make that fix? I think we can then land this CL
with the DCHECK in and leave the discussion of what to do with that DCHECK
(i.e., the status of the bug that Bernhard referenced) as a separate issue.

[Jitu( very slow this week), 2015/10/30 13:52:53]

Nice catch
Done

+
+  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));
 #if defined(OS_ANDROID)
-  return new GCMProfileService(Profile::FromBrowserContext(context));
+  return new GCMProfileService(profile->GetPath(), blocking_task_runner);
 #else
   return new GCMProfileService(
-      Profile::FromBrowserContext(context),
-      scoped_ptr<GCMClientFactory>(new GCMClientFactory));
+      profile->GetPrefs(), profile->GetPath(), profile->GetRequestContext(),
+      chrome::GetChannel(),
+      scoped_ptr<ProfileIdentityProvider>(new ProfileIdentityProvider(
+          SigninManagerFactory::GetForProfile(profile),
+          ProfileOAuth2TokenServiceFactory::GetForProfile(profile),
+          LoginUIServiceFactory::GetShowLoginPopupCallbackForProfile(profile))),
+      scoped_ptr<GCMClientFactory>(new GCMClientFactory),
+      content::BrowserThread::GetMessageLoopProxyForThread(
+          content::BrowserThread::UI),
+      content::BrowserThread::GetMessageLoopProxyForThread(
+          content::BrowserThread::IO),
+      blocking_task_runner);
 #endif
 }