Componentize VersionInfo.

chrome/common/sync_util.cc

 // 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 "chrome/common/sync_util.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "url/gurl.h"
 
 namespace {
 
-// Converts VersionInfo::Channel to string for user-agent string.
-std::string ChannelToString(chrome::VersionInfo::Channel channel) {
+// Converts version_info::Channel to string for user-agent string.
+std::string ChannelToString(version_info::Channel channel) {
   switch (channel) {
-    case chrome::VersionInfo::CHANNEL_UNKNOWN:
+    case version_info::Channel::UNKNOWN:
       return "unknown";
-    case chrome::VersionInfo::CHANNEL_CANARY:
+    case version_info::Channel::CANARY:
       return "canary";
-    case chrome::VersionInfo::CHANNEL_DEV:
+    case version_info::Channel::DEV:
       return "dev";
-    case chrome::VersionInfo::CHANNEL_BETA:
+    case version_info::Channel::BETA:
       return "beta";
-    case chrome::VersionInfo::CHANNEL_STABLE:
+    case version_info::Channel::STABLE:
       return "stable";
     default:
       NOTREACHED();
       return "unknown";
   }
 }
 }  // namespace
 
 namespace internal {
 const char* kSyncServerUrl = "https://clients4.google.com/chrome-sync";
 
 const char* kSyncDevServerUrl = "https://clients4.google.com/chrome-sync/dev";
 }  // namespace internal
 
 GURL GetSyncServiceURL(const base::CommandLine& command_line) {
   // 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);
 
-  chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
-  if (channel == chrome::VersionInfo::CHANNEL_STABLE ||
-      channel == chrome::VersionInfo::CHANNEL_BETA) {
+  version_info::Channel channel = chrome::VersionInfo::GetChannel();
+  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);
@@ skipping 33 matching lines @@
   user_agent += version_info.Version();
   user_agent += " (" + version_info.LastChange() + ")";
   if (!version_info.IsOfficialBuild()) {
     user_agent += "-devel";
   } else {
     user_agent +=
         " channel(" + ChannelToString(version_info.GetChannel()) + ")";
   }
   return user_agent;
 }