Cleanup VersionInfo after componentization.

chrome/browser/component_updater/chrome_component_updater_configurator.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/browser/component_updater/chrome_component_updater_configurator.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/version.h"
 #include "build/build_config.h"
 #include "chrome/browser/component_updater/component_patcher_operation_out_of_process.h"
 #include "chrome/browser/component_updater/component_updater_url_constants.h"
 #include "chrome/browser/update_client/chrome_update_query_params_delegate.h"
-#include "chrome/common/chrome_version_info.h"
 #include "components/component_updater/component_updater_switches.h"
 #include "components/update_client/configurator.h"
+#include "components/version_info/version_info.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "url/gurl.h"
 
 #if defined(OS_WIN)
 #include "base/win/win_util.h"
 #endif  // OS_WIN
 
 using update_client::Configurator;
 using update_client::OutOfProcessPatcher;
@@ skipping 178 matching lines @@
     }
   }
   return urls;
 }
 
 std::vector<GURL> ChromeConfigurator::PingUrl() const {
   return pings_enabled_ ? UpdateUrl() : std::vector<GURL>();
 }
 
 base::Version ChromeConfigurator::GetBrowserVersion() const {
-  return base::Version(chrome::VersionInfo().Version());
+  return base::Version(version_info::GetVersionNumber());
 }
 
 std::string ChromeConfigurator::GetChannel() const {
   return ChromeUpdateQueryParamsDelegate::GetChannelString();
 }
 
 std::string ChromeConfigurator::GetLang() const {
   return ChromeUpdateQueryParamsDelegate::GetLang();
 }
 
 std::string ChromeConfigurator::GetOSLongName() const {
-  return chrome::VersionInfo().OSType();
+  return version_info::GetOSType();
 }
 
 std::string ChromeConfigurator::ExtraRequestParams() const {
   return extra_info_;
 }
 
 net::URLRequestContextGetter* ChromeConfigurator::RequestContext() const {
   return url_request_getter_;
 }
 
@@ skipping 27 matching lines @@
 }  // namespace
 
 scoped_refptr<update_client::Configurator>
 MakeChromeComponentUpdaterConfigurator(
     const base::CommandLine* cmdline,
     net::URLRequestContextGetter* context_getter) {
   return new ChromeConfigurator(cmdline, context_getter);
 }
 
 }  // namespace component_updater