Componentize chrome/common/sync_util

chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc

Index: chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc
diff --git a/chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc b/chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc
index d7173ea7d1aa2198c3e476d3b3084f821f14a6fa..b04df9bcb5307148829510bdcba1316b84df6b20 100644
--- a/chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc
+++ b/chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc
@@ -13,11 +13,12 @@
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/sync/supervised_user_signin_manager_wrapper.h"
+#include "chrome/common/channel_info.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/sync_util.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/sync_driver/data_type_controller.h"
+#include "components/sync_driver/sync_util.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "google_apis/gaia/oauth2_token_service.h"
@@ -104,21 +105,19 @@ class ProfileSyncComponentsFactoryImplTest : public testing::Test {
   void TestSwitchDisablesType(syncer::ModelTypeSet types) {
     command_line_->AppendSwitchASCII(switches::kDisableSyncTypes,
                                      syncer::ModelTypeSetToString(types));
-    GURL sync_service_url = GetSyncServiceURL(*command_line_);
+    GURL sync_service_url =
+        GetSyncServiceURL(*command_line_, chrome::GetChannel());
     ProfileOAuth2TokenService* token_service =
         ProfileOAuth2TokenServiceFactory::GetForProfile(profile_.get());
     scoped_ptr<ProfileSyncService> pss(new ProfileSyncService(
         scoped_ptr<ProfileSyncComponentsFactory>(
             new ProfileSyncComponentsFactoryImpl(
-                profile_.get(),
-                command_line_.get(),
-                GetSyncServiceURL(*command_line_),
-                token_service,
-                profile_->GetRequestContext())),
+                profile_.get(), command_line_.get(),
+                GetSyncServiceURL(*command_line_, chrome::GetChannel()),
+                token_service, profile_->GetRequestContext())),
         profile_.get(),
         make_scoped_ptr<SupervisedUserSigninManagerWrapper>(NULL),
-        token_service,
-        browser_sync::MANUAL_START));
+        token_service, browser_sync::MANUAL_START));
     pss->factory()->RegisterDataTypes(pss.get());
     DataTypeController::StateMap controller_states;
     pss->GetDataTypeControllerStates(&controller_states);
@@ -138,15 +137,11 @@ TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDefault) {
   scoped_ptr<ProfileSyncService> pss(new ProfileSyncService(
       scoped_ptr<ProfileSyncComponentsFactory>(
           new ProfileSyncComponentsFactoryImpl(
-              profile_.get(),
-              command_line_.get(),
-              GetSyncServiceURL(*command_line_),
-              token_service,
-              profile_->GetRequestContext())),
-      profile_.get(),
-      make_scoped_ptr<SupervisedUserSigninManagerWrapper>(NULL),
-      token_service,
-      browser_sync::MANUAL_START));
+              profile_.get(), command_line_.get(),
+              GetSyncServiceURL(*command_line_, chrome::GetChannel()),
+              token_service, profile_->GetRequestContext())),
+      profile_.get(), make_scoped_ptr<SupervisedUserSigninManagerWrapper>(NULL),
+      token_service, browser_sync::MANUAL_START));
   pss->factory()->RegisterDataTypes(pss.get());
   DataTypeController::StateMap controller_states;
   pss->GetDataTypeControllerStates(&controller_states);