Componentize chrome/common/sync_util

components/sync_driver/sync_util_unittest.cc

Index: components/sync_driver/sync_util_unittest.cc
diff --git a/chrome/common/sync_util_unittest.cc b/components/sync_driver/sync_util_unittest.cc
similarity index 74%
rename from chrome/common/sync_util_unittest.cc
rename to components/sync_driver/sync_util_unittest.cc
index d9325cff863972a7df46837611403407f59f515f..2f08aa4a77f5c09e1015a34375e388b18b01bb08 100644
--- a/chrome/common/sync_util_unittest.cc
+++ b/components/sync_driver/sync_util_unittest.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/common/sync_util.h"
+#include "components/sync_driver/sync_util.h"
 
 #include "base/command_line.h"
 #include "base/strings/string_util.h"
-#include "chrome/common/chrome_switches.h"
+#include "components/sync_driver/sync_driver_switches.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
@@ -16,7 +16,8 @@ TEST(SyncUtilTest, GetSyncServiceURLWithoutCommandLineSwitch) {
   // If the command line is not set the url is one of two constants chosen based
   // on the channel (e.g. beta).
   base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
-  std::string url = GetSyncServiceURL(command_line).spec();
+  std::string url =
+      GetSyncServiceURL(command_line, version_info::Channel::BETA).spec();
   ASSERT_TRUE(internal::kSyncServerUrl == url ||
               internal::kSyncDevServerUrl == url);
 }
@@ -25,20 +26,24 @@ TEST(SyncUtilTest, GetSyncServiceURLWithCommandLineSwitch) {
   // See that we can set the URL via the command line.
   base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
   command_line.AppendSwitchASCII(switches::kSyncServiceURL, "https://foo/bar");
-  ASSERT_EQ("https://foo/bar", GetSyncServiceURL(command_line).spec());
+  ASSERT_EQ(
+      "https://foo/bar",
+      GetSyncServiceURL(command_line, version_info::Channel::UNKNOWN).spec());
 }
 
 TEST(SyncUtilTest, GetSyncServiceURLWithBadCommandLineSwitch) {
   // If the command line value is not a valid url it is ignored.
   base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
   command_line.AppendSwitchASCII(switches::kSyncServiceURL, "invalid_url");
-  std::string url = GetSyncServiceURL(command_line).spec();
+  std::string url =
+      GetSyncServiceURL(command_line, version_info::Channel::UNKNOWN).spec();
   ASSERT_TRUE(internal::kSyncServerUrl == url ||
               internal::kSyncDevServerUrl == url);
 }
 
 TEST(SyncUtilTest, MakeUserAgentForSync) {
-  std::string user_agent = MakeUserAgentForSync("TEST");
+  std::string user_agent =
+      MakeUserAgentForSync("TEST", version_info::Channel::UNKNOWN);
   ASSERT_TRUE(base::StartsWith(user_agent, "Chrome TEST",
                                base::CompareCase::SENSITIVE));
 }