Componentize chrome/common/sync_util

components/sync_driver/sync_util.h

Index: components/sync_driver/sync_util.h
diff --git a/chrome/common/sync_util.h b/components/sync_driver/sync_util.h
similarity index 57%
rename from chrome/common/sync_util.h
rename to components/sync_driver/sync_util.h
index d219f043cdf61abe17f1cec415c0e9a5605d10c8..f0de6460775f7e5d7c9253b741c52433f35b4617 100644
--- a/chrome/common/sync_util.h
+++ b/components/sync_driver/sync_util.h
@@ -2,11 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_COMMON_SYNC_UTIL_H_
-#define CHROME_COMMON_SYNC_UTIL_H_
+#ifndef COMPONENTS_SYNC_DRIVER_SYNC_UTIL_H_
+#define COMPONENTS_SYNC_DRIVER_SYNC_UTIL_H_
 
 #include <string>
 
+#include "components/version_info/version_info.h"
+
 class GURL;
 
 namespace base {
@@ -21,12 +23,14 @@ extern const char* kSyncServerUrl;
 extern const char* kSyncDevServerUrl;
 }
 
-GURL GetSyncServiceURL(const base::CommandLine& command_line);
+GURL GetSyncServiceURL(const base::CommandLine& command_line,
+                       version_info::Channel channel);
 
 // Helper to construct a user agent string (ASCII) suitable for use by
 // the syncapi for any HTTP communication. This string is used by the sync
 // backend for classifying client types when calculating statistics.
-std::string MakeDesktopUserAgentForSync();
-std::string MakeUserAgentForSync(const std::string& system);
+std::string MakeDesktopUserAgentForSync(version_info::Channel channel);
+std::string MakeUserAgentForSync(const std::string& system,
+                                 version_info::Channel channel);
 
-#endif  // CHROME_COMMON_SYNC_UTIL_H_
+#endif  // COMPONENTS_SYNC_DRIVER_SYNC_UTIL_H_