Componentize VersionInfo.

chrome/common/gcm_desktop_util.cc

 // Copyright 2014 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/gcm_desktop_util.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/sequenced_task_runner.h"
 #include "base/threading/sequenced_worker_pool.h"
@@ skipping 24 matching lines @@
   return GCMClient::PLATFORM_CROS;
 #elif defined(OS_LINUX)
   return GCMClient::PLATFORM_LINUX;
 #else
   // For all other platforms, return as LINUX.
   return GCMClient::PLATFORM_LINUX;
 #endif
 }
 
 GCMClient::ChromeChannel GetChannel() {
-  chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
+  version_info::Channel channel = chrome::VersionInfo::GetChannel();
   switch (channel) {
-    case chrome::VersionInfo::CHANNEL_UNKNOWN:
+    case version_info::Channel::UNKNOWN:
       return GCMClient::CHANNEL_UNKNOWN;
-    case chrome::VersionInfo::CHANNEL_CANARY:
+    case version_info::Channel::CANARY:
       return GCMClient::CHANNEL_CANARY;
-    case chrome::VersionInfo::CHANNEL_DEV:
+    case version_info::Channel::DEV:
       return GCMClient::CHANNEL_DEV;
-    case chrome::VersionInfo::CHANNEL_BETA:
+    case version_info::Channel::BETA:
       return GCMClient::CHANNEL_BETA;
-    case chrome::VersionInfo::CHANNEL_STABLE:
+    case version_info::Channel::STABLE:
       return GCMClient::CHANNEL_STABLE;
     default:
       NOTREACHED();
       return GCMClient::CHANNEL_UNKNOWN;
   }
 }
 
 std::string GetVersion() {
   chrome::VersionInfo version_info;
   return version_info.Version();
@@ skipping 34 matching lines @@
       GetUserAgent(),
       prefs,
       store_path,
       request_context,
       ui_thread,
       io_thread,
       blocking_task_runner));
 }
 
 }  // namespace gcm