Componentize VersionInfo.

chrome/common/extensions/features/feature_channel.cc

Index: chrome/common/extensions/features/feature_channel.cc
diff --git a/chrome/common/extensions/features/feature_channel.cc b/chrome/common/extensions/features/feature_channel.cc
index e1cce9f61540321ca0a8a59d12603570534f699c..42751399be6a4d95159351d49a41bd6dbc38daa5 100644
--- a/chrome/common/extensions/features/feature_channel.cc
+++ b/chrome/common/extensions/features/feature_channel.cc
@@ -8,27 +8,27 @@ using chrome::VersionInfo;
 
 namespace {
 
-const VersionInfo::Channel kDefaultChannel = VersionInfo::CHANNEL_STABLE;
-VersionInfo::Channel g_current_channel = kDefaultChannel;
+const version_info::Channel kDefaultChannel = version_info::CHANNEL_STABLE;
+version_info::Channel g_current_channel = kDefaultChannel;
 
 }  // namespace
 
 namespace extensions {
 
-VersionInfo::Channel GetCurrentChannel() {
+version_info::Channel GetCurrentChannel() {
   return g_current_channel;
 }
 
-void SetCurrentChannel(VersionInfo::Channel channel) {
+void SetCurrentChannel(version_info::Channel channel) {
   g_current_channel = channel;
 }
 
-VersionInfo::Channel GetDefaultChannel() {
+version_info::Channel GetDefaultChannel() {
   return kDefaultChannel;
 }
 
-ScopedCurrentChannel::ScopedCurrentChannel(VersionInfo::Channel channel)
-    : original_channel_(VersionInfo::CHANNEL_UNKNOWN) {
+ScopedCurrentChannel::ScopedCurrentChannel(version_info::Channel channel)
+    : original_channel_(version_info::CHANNEL_UNKNOWN) {
   original_channel_ = GetCurrentChannel();
   SetCurrentChannel(channel);
 }