[Sync] Move //components/sync_driver to //components/sync/driver.

components/sync_driver/sync_util.cc

Index: components/sync_driver/sync_util.cc
diff --git a/components/sync_driver/sync_util.cc b/components/sync_driver/sync_util.cc
deleted file mode 100644
index 29606df85e2fcde9a837f89f80d433b3cfde0fd7..0000000000000000000000000000000000000000
--- a/components/sync_driver/sync_util.cc
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright 2015 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 "components/sync_driver/sync_util.h"
-
-#include "base/command_line.h"
-#include "base/logging.h"
-#include "build/build_config.h"
-#include "components/sync_driver/sync_driver_switches.h"
-#include "url/gurl.h"
-
-namespace {
-
-// Returns string that represents system in UserAgent.
-std::string GetSystemString(bool is_tablet) {
-  std::string system;
-#if defined(OS_CHROMEOS)
-  system = "CROS ";
-#elif defined(OS_ANDROID)
-  if (is_tablet) {
-    system = "ANDROID-TABLET ";
-  } else {
-    system = "ANDROID-PHONE ";
-  }
-#elif defined(OS_IOS)
-  if (is_tablet) {
-    system = "IOS-TABLET ";
-  } else {
-    system = "IOS-PHONE ";
-  }
-#elif defined(OS_WIN)
-  system = "WIN ";
-#elif defined(OS_LINUX)
-  system = "LINUX ";
-#elif defined(OS_FREEBSD)
-  system = "FREEBSD ";
-#elif defined(OS_OPENBSD)
-  system = "OPENBSD ";
-#elif defined(OS_MACOSX)
-  system = "MAC ";
-#endif
-  return system;
-}
-
-}  // namespace
-
-namespace internal {
-
-const char* kSyncServerUrl = "https://clients4.google.com/chrome-sync";
-
-const char* kSyncDevServerUrl = "https://clients4.google.com/chrome-sync/dev";
-
-std::string FormatUserAgentForSync(const std::string& system,
-                                   version_info::Channel channel) {
-  std::string user_agent;
-  user_agent = "Chrome ";
-  user_agent += system;
-  user_agent += version_info::GetVersionNumber();
-  user_agent += " (" + version_info::GetLastChange() + ")";
-  if (!version_info::IsOfficialBuild()) {
-    user_agent += "-devel";
-  } else {
-    user_agent += " channel(" + version_info::GetChannelString(channel) + ")";
-  }
-  return user_agent;
-}
-
-}  // namespace internal
-
-GURL GetSyncServiceURL(const base::CommandLine& command_line,
-                       version_info::Channel channel) {
-  // By default, dev, canary, and unbranded Chromium users will go to the
-  // development servers. Development servers have more features than standard
-  // sync servers. Users with officially-branded Chrome stable and beta builds
-  // will go to the standard sync servers.
-  GURL result(internal::kSyncDevServerUrl);
-
-  if (channel == version_info::Channel::STABLE ||
-      channel == version_info::Channel::BETA) {
-    result = GURL(internal::kSyncServerUrl);
-  }
-
-  // Override the sync server URL from the command-line, if sync server
-  // command-line argument exists.
-  if (command_line.HasSwitch(switches::kSyncServiceURL)) {
-    std::string value(
-        command_line.GetSwitchValueASCII(switches::kSyncServiceURL));
-    if (!value.empty()) {
-      GURL custom_sync_url(value);
-      if (custom_sync_url.is_valid()) {
-        result = custom_sync_url;
-      } else {
-        LOG(WARNING) << "The following sync URL specified at the command-line "
-                     << "is invalid: " << value;
-      }
-    }
-  }
-  return result;
-}
-
-std::string MakeUserAgentForSync(version_info::Channel channel,
-                                 bool is_tablet) {
-  std::string system = GetSystemString(is_tablet);
-  return internal::FormatUserAgentForSync(system, channel);
-}