Componentizing chrome/browser/services/gcm/gcm_desktop_utils.cc.

components/gcm_driver/gcm_desktop_utils.cc

Index: components/gcm_driver/gcm_desktop_utils.cc
diff --git a/chrome/browser/services/gcm/gcm_desktop_utils.cc b/components/gcm_driver/gcm_desktop_utils.cc
similarity index 66%
rename from chrome/browser/services/gcm/gcm_desktop_utils.cc
rename to components/gcm_driver/gcm_desktop_utils.cc
index 206d875a1373653773c595afbf10c9ea4756391b..f5049f5738f8c5519a0c1d54c22dc75918380247 100644
--- a/chrome/browser/services/gcm/gcm_desktop_utils.cc
+++ b/components/gcm_driver/gcm_desktop_utils.cc
@@ -2,18 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/services/gcm/gcm_desktop_utils.h"
+#include "components/gcm_driver/gcm_desktop_utils.h"
 
 #include "base/command_line.h"
 #include "base/sequenced_task_runner.h"
 #include "base/threading/sequenced_worker_pool.h"
-#include "chrome/common/channel_info.h"
 #include "components/gcm_driver/gcm_client_factory.h"
 #include "components/gcm_driver/gcm_driver.h"
 #include "components/gcm_driver/gcm_driver_desktop.h"
 #include "components/sync_driver/sync_util.h"
-#include "components/version_info/version_info.h"
-#include "content/public/browser/browser_thread.h"
 #include "url/gurl.h"
 
 namespace gcm {
@@ -41,8 +38,7 @@ GCMClient::ChromePlatform GetPlatform() {
 #endif
 }
 
-GCMClient::ChromeChannel GetChannel() {
-  version_info::Channel channel = chrome::GetChannel();
+GCMClient::ChromeChannel GetChannel(version_info::Channel channel) {
   switch (channel) {
     case version_info::Channel::UNKNOWN:
       return GCMClient::CHANNEL_UNKNOWN;
@@ -64,22 +60,22 @@ std::string GetVersion() {
   return version_info::GetVersionNumber();
 }
 
-GCMClient::ChromeBuildInfo GetChromeBuildInfo() {
+GCMClient::ChromeBuildInfo GetChromeBuildInfo(version_info::Channel channel) {
   GCMClient::ChromeBuildInfo chrome_build_info;
   chrome_build_info.platform = GetPlatform();
-  chrome_build_info.channel = GetChannel();
+  chrome_build_info.channel = GetChannel(channel);
   chrome_build_info.version = GetVersion();
   return chrome_build_info;
 }
 
-std::string GetChannelStatusRequestUrl() {
+std::string GetChannelStatusRequestUrl(version_info::Channel channel) {
   GURL sync_url(GetSyncServiceURL(*base::CommandLine::ForCurrentProcess(),
-                                  chrome::GetChannel()));
+                                  channel));
   return sync_url.spec() + kChannelStatusRelativePath;
 }
 
-std::string GetUserAgent() {
-  return MakeDesktopUserAgentForSync(chrome::GetChannel());
+std::string GetUserAgent(version_info::Channel channel) {
+  return MakeDesktopUserAgentForSync(channel);
 }
 
 }  // namespace
@@ -88,27 +84,22 @@ scoped_ptr<GCMDriver> CreateGCMDriverDesktop(
     scoped_ptr<GCMClientFactory> gcm_client_factory,
     PrefService* prefs,
     const base::FilePath& store_path,
-    const scoped_refptr<net::URLRequestContextGetter>& request_context) {
-
-  scoped_refptr<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));
+    const scoped_refptr<net::URLRequestContextGetter>& request_context,
+    version_info::Channel channel,
+    const scoped_refptr<base::SequencedTaskRunner>& ui_task_runner,
+    const scoped_refptr<base::SequencedTaskRunner>& io_task_runner,
+    const scoped_refptr<base::SequencedTaskRunner>& blocking_task_runner) {

[droger, 2015/09/02 08:39:32]

The link error is because this code is not intended to be used on Android and
the GCMDriverDesktop class is not compiled on Android.

I think the right fix is to do something like:

#if defined(OS_ANDROID)
  NOTREACHED();
  return make_scoped_ptr<GCMDriver>(nullptr);
#else
  return scoped_ptr<GCMDriver>(new GCMDriverDesktop(
      ...));
#endif

 
   return scoped_ptr<GCMDriver>(new GCMDriverDesktop(
       gcm_client_factory.Pass(),
-      GetChromeBuildInfo(),
-      GetChannelStatusRequestUrl(),
-      GetUserAgent(),
+      GetChromeBuildInfo(channel),
+      GetChannelStatusRequestUrl(channel),
+      GetUserAgent(channel),
       prefs,
       store_path,
       request_context,
-      content::BrowserThread::GetMessageLoopProxyForThread(
-          content::BrowserThread::UI),
-      content::BrowserThread::GetMessageLoopProxyForThread(
-          content::BrowserThread::IO),
+      ui_task_runner,
+      io_task_runner,
       blocking_task_runner));
 }