Componentize chrome/common/sync_util

chrome/browser/services/gcm/gcm_desktop_utils.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/services/gcm/gcm_desktop_utils.h"
 
 #include "base/command_line.h"
 #include "base/sequenced_task_runner.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/services/gcm/gcm_desktop_utils.h"
 #include "chrome/common/channel_info.h"
-#include "chrome/common/sync_util.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 {
 
 namespace {
 
 const char kChannelStatusRelativePath[] = "/experimentstatus";
 
@@ skipping 41 matching lines @@
 
 GCMClient::ChromeBuildInfo GetChromeBuildInfo() {
   GCMClient::ChromeBuildInfo chrome_build_info;
   chrome_build_info.platform = GetPlatform();
   chrome_build_info.channel = GetChannel();
   chrome_build_info.version = GetVersion();
   return chrome_build_info;
 }
 
 std::string GetChannelStatusRequestUrl() {
-  GURL sync_url(GetSyncServiceURL(*base::CommandLine::ForCurrentProcess()));
+  GURL sync_url(GetSyncServiceURL(*base::CommandLine::ForCurrentProcess(),
+                                  chrome::GetChannel()));
   return sync_url.spec() + kChannelStatusRelativePath;
 }
 
 std::string GetUserAgent() {
-  return MakeDesktopUserAgentForSync();
+  return MakeDesktopUserAgentForSync(chrome::GetChannel());
 }
 
 }  // namespace
 
 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));
 
   return scoped_ptr<GCMDriver>(new GCMDriverDesktop(
-      gcm_client_factory.Pass(),
-      GetChromeBuildInfo(),
-      GetChannelStatusRequestUrl(),
-      GetUserAgent(),
-      prefs,
-      store_path,
-      request_context,
-      content::BrowserThread::GetMessageLoopProxyForThread(
-          content::BrowserThread::UI),
+      gcm_client_factory.Pass(), GetChromeBuildInfo(),
+      GetChannelStatusRequestUrl(), GetUserAgent(), prefs, store_path,
+      request_context, content::BrowserThread::GetMessageLoopProxyForThread(
+                           content::BrowserThread::UI),
       content::BrowserThread::GetMessageLoopProxyForThread(
           content::BrowserThread::IO),
       blocking_task_runner));
 }
 
 }  // namespace gcm