Cleanup VersionInfo after componentization.

chrome/browser/ui/extensions/extension_message_bubble_factory.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/browser/ui/extensions/extension_message_bubble_factory.h"
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/metrics/field_trial.h"
 #include "chrome/browser/extensions/dev_mode_bubble_controller.h"
 #include "chrome/browser/extensions/extension_message_bubble_controller.h"
 #include "chrome/browser/extensions/install_verifier.h"
 #include "chrome/browser/extensions/proxy_overridden_bubble_controller.h"
 #include "chrome/browser/extensions/settings_api_bubble_controller.h"
 #include "chrome/browser/extensions/settings_api_helpers.h"
 #include "chrome/browser/extensions/suspicious_extension_bubble_controller.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/common/channel_info.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/chrome_version_info.h"
+#include "components/version_info/version_info.h"
 #include "extensions/common/feature_switch.h"
 
 namespace {
 
 // A map of all profiles evaluated, so we can tell if it's the initial check.
 // TODO(devlin): It would be nice to coalesce all the "profiles evaluated" maps
 // that are in the different bubble controllers.
 base::LazyInstance<std::set<Profile*> > g_profiles_evaluated =
     LAZY_INSTANCE_INITIALIZER;
 
@@ skipping 38 matching lines @@
   return g_enabled_for_tests ||
          IsExperimentEnabled(kEnableProxyWarningExperimentName);
 #endif
 }
 
 bool EnableDevModeBubble() {
   if (extensions::FeatureSwitch::force_dev_mode_highlighting()->IsEnabled())
     return true;
 
 #if defined(OS_WIN)
-  if (chrome::VersionInfo::GetChannel() >= version_info::Channel::BETA)
+  if (chrome::GetChannel() >= version_info::Channel::BETA)
     return true;
 #endif
 
   return g_enabled_for_tests ||
          IsExperimentEnabled(kEnableDevModeWarningExperimentName);
 }
 
 }  // namespace
 
 ExtensionMessageBubbleFactory::ExtensionMessageBubbleFactory(Profile* profile)
@@ skipping 56 matching lines @@
       return controller.Pass();
   }
 
   return scoped_ptr<extensions::ExtensionMessageBubbleController>();
 }
 
 // static
 void ExtensionMessageBubbleFactory::set_enabled_for_tests(bool enabled) {
   g_enabled_for_tests = enabled;
 }