Componentize VersionInfo.

chrome/common/chrome_version_info_chromeos.cc

Index: chrome/common/chrome_version_info_chromeos.cc
diff --git a/chrome/common/chrome_version_info_chromeos.cc b/chrome/common/chrome_version_info_chromeos.cc
index 22d9ef76760308d2c5c57a0f7c480c60451d31a1..8c33014d24a7955eaa7e64b5b54535cca24d3fa6 100644
--- a/chrome/common/chrome_version_info_chromeos.cc
+++ b/chrome/common/chrome_version_info_chromeos.cc
@@ -6,19 +6,19 @@
 
 namespace chrome {
 
-static VersionInfo::Channel chromeos_channel = VersionInfo::CHANNEL_UNKNOWN;
+static version_info::Channel chromeos_channel = version_info::CHANNEL_UNKNOWN;
 
 // static
 std::string VersionInfo::GetVersionStringModifier() {
 #if defined(GOOGLE_CHROME_BUILD)
   switch (chromeos_channel) {
-    case CHANNEL_STABLE:
+    case version_info::CHANNEL_STABLE:
       return "";
-    case CHANNEL_BETA:
+    case version_info::CHANNEL_BETA:
       return "beta";
-    case CHANNEL_DEV:
+    case version_info::CHANNEL_DEV:
       return "dev";
-    case CHANNEL_CANARY:
+    case version_info::CHANNEL_CANARY:
       return "canary";
     default:
       return "unknown";
@@ -28,7 +28,7 @@ std::string VersionInfo::GetVersionStringModifier() {
 }
 
 // static
-VersionInfo::Channel VersionInfo::GetChannel() {
+version_info::Channel VersionInfo::GetChannel() {
   return chromeos_channel;
 }
 
@@ -36,13 +36,13 @@ VersionInfo::Channel VersionInfo::GetChannel() {
 void VersionInfo::SetChannel(const std::string& channel) {
 #if defined(GOOGLE_CHROME_BUILD)
   if (channel == "stable-channel") {
-    chromeos_channel = CHANNEL_STABLE;
+    chromeos_channel = version_info::CHANNEL_STABLE;
   } else if (channel == "beta-channel") {
-    chromeos_channel = CHANNEL_BETA;
+    chromeos_channel = version_info::CHANNEL_BETA;
   } else if (channel == "dev-channel") {
-    chromeos_channel = CHANNEL_DEV;
+    chromeos_channel = version_info::CHANNEL_DEV;
   } else if (channel == "canary-channel") {
-    chromeos_channel = CHANNEL_CANARY;
+    chromeos_channel = version_info::CHANNEL_CANARY;
   }
 #endif
 }