Componentize chrome/common/sync_util

chrome/browser/sync/profile_sync_service_factory.cc

Index: chrome/browser/sync/profile_sync_service_factory.cc
diff --git a/chrome/browser/sync/profile_sync_service_factory.cc b/chrome/browser/sync/profile_sync_service_factory.cc
index 0c19634bcf3143c1a301c95f5413b2b65fe426f3..324393093161dce8099642f7c7c9ee2f3c8c103d 100644
--- a/chrome/browser/sync/profile_sync_service_factory.cc
+++ b/chrome/browser/sync/profile_sync_service_factory.cc
@@ -29,10 +29,11 @@
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
 #include "chrome/browser/web_data_service_factory.h"
-#include "chrome/common/sync_util.h"
+#include "chrome/common/channel_info.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_manager.h"
+#include "components/sync_driver/sync_util.h"
 #include "components/variations/variations_associated_data.h"
 #include "url/gurl.h"
 
@@ -125,8 +126,8 @@ KeyedService* ProfileSyncServiceFactory::BuildServiceInstanceFor(
   // once http://crbug.com/171406 has been fixed.
   AboutSigninInternalsFactory::GetForProfile(profile);
 
-  const GURL sync_service_url =
-      GetSyncServiceURL(*base::CommandLine::ForCurrentProcess());
+  const GURL sync_service_url = GetSyncServiceURL(
+      *base::CommandLine::ForCurrentProcess(), chrome::GetChannel());
 
   scoped_ptr<SupervisedUserSigninManagerWrapper> signin_wrapper(
       new SupervisedUserSigninManagerWrapper(profile, signin));