Cleanup VersionInfo after componentization.

chrome/browser/extensions/chrome_extensions_browser_client.cc

 // Copyright 2013 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/extensions/chrome_extensions_browser_client.h"
 
 #include "base/command_line.h"
 #include "base/version.h"
 #include "chrome/browser/app_mode/app_mode_utils.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 13 matching lines @@
 #include "chrome/browser/extensions/chrome_url_request_util.h"
 #include "chrome/browser/extensions/error_console/error_console.h"
 #include "chrome/browser/extensions/event_router_forwarder.h"
 #include "chrome/browser/extensions/extension_system_factory.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/extensions/menu_manager.h"
 #include "chrome/browser/external_protocol/external_protocol_handler.h"
 #include "chrome/browser/net/chrome_net_log.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/common/channel_info.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/chrome_version_info.h"
 #include "chrome/common/extensions/features/feature_channel.h"
 #include "chrome/common/pref_names.h"
+#include "components/version_info/version_info.h"
 #include "content/public/browser/render_process_host.h"
 #include "extensions/browser/api/generated_api_registration.h"
 #include "extensions/browser/extension_function_registry.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/mojo/service_registration.h"
 #include "extensions/browser/pref_names.h"
 #include "extensions/browser/url_request_util.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/extensions/updater/chromeos_extension_cache_delegate.h"
 #include "chrome/browser/extensions/updater/extension_cache_impl.h"
 #include "chromeos/chromeos_switches.h"
 #else
 #include "extensions/browser/updater/null_extension_cache.h"
 #endif
 
 namespace extensions {
 
 ChromeExtensionsBrowserClient::ChromeExtensionsBrowserClient() {
   process_manager_delegate_.reset(new ChromeProcessManagerDelegate);
   api_client_.reset(new ChromeExtensionsAPIClient);
   // Only set if it hasn't already been set (e.g. by a test).
   if (GetCurrentChannel() == GetDefaultChannel())
-    SetCurrentChannel(chrome::VersionInfo::GetChannel());
+    SetCurrentChannel(chrome::GetChannel());
   resource_manager_.reset(new ChromeComponentExtensionResourceManager());
 }
 
 ChromeExtensionsBrowserClient::~ChromeExtensionsBrowserClient() {}
 
 bool ChromeExtensionsBrowserClient::IsShuttingDown() {
   return g_browser_process->IsShuttingDown();
 }
 
 bool ChromeExtensionsBrowserClient::AreExtensionsDisabled(
@@ skipping 124 matching lines @@
     return false;
 
   PrefService* pref_service = extension_prefs->pref_service();
   base::Version last_version;
   if (pref_service->HasPrefPath(pref_names::kLastChromeVersion)) {
     std::string last_version_str =
         pref_service->GetString(pref_names::kLastChromeVersion);
     last_version = base::Version(last_version_str);
   }
 
-  chrome::VersionInfo current_version_info;
-  std::string current_version = current_version_info.Version();
+  std::string current_version = version_info::GetVersionNumber();
   pref_service->SetString(pref_names::kLastChromeVersion,
                           current_version);
 
   // If there was no version string in prefs, assume we're out of date.
   if (!last_version.IsValid())
     return true;
 
   return last_version.IsOlderThan(current_version);
 }
 
@@ skipping 83 matching lines @@
   return extension_cache_.get();
 }
 
 bool ChromeExtensionsBrowserClient::IsBackgroundUpdateAllowed() {
   return !base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kDisableBackgroundNetworking);
 }
 
 bool ChromeExtensionsBrowserClient::IsMinBrowserVersionSupported(
     const std::string& min_version) {
-  chrome::VersionInfo version_info;
-  base::Version browser_version = base::Version(version_info.Version());
+  base::Version browser_version =
+      base::Version(version_info::GetVersionNumber());
   Version browser_min_version(min_version);
   if (browser_version.IsValid() && browser_min_version.IsValid() &&
       browser_min_version.CompareTo(browser_version) > 0) {
     return false;
   }
   return true;
 }
 
 ExtensionWebContentsObserver*
 ChromeExtensionsBrowserClient::GetExtensionWebContentsObserver(
@@ skipping 14 matching lines @@
       ->GetBrowserContext();
 
   // Clean up context menus for the WebView.
   auto menu_manager =
       MenuManager::Get(Profile::FromBrowserContext(browser_context));
   menu_manager->RemoveAllContextItems(
       MenuItem::ExtensionKey("", embedder_process_id, view_instance_id));
 }
 
 }  // namespace extensions