Cleanup VersionInfo after componentization.

chrome/browser/safe_browsing/incident_reporting/environment_data_collection.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/safe_browsing/incident_reporting/environment_data_collection.h"
 
 #include <string>
 
 #include "base/cpu.h"
 #include "base/sys_info.h"
-#include "chrome/common/chrome_version_info.h"
+#include "chrome/common/channel_info.h"
 #include "chrome/common/safe_browsing/csd.pb.h"
+#include "components/version_info/version_info.h"
 
 namespace safe_browsing {
 
 // Populates |process| with platform-specific data related to the chrome browser
 // process.
 void CollectPlatformProcessData(
     ClientIncidentReport_EnvironmentData_Process* process);
 
 namespace {
 
 ClientIncidentReport_EnvironmentData_Process_Channel MapChannelToProtobuf(
     version_info::Channel channel) {
   typedef ClientIncidentReport_EnvironmentData_Process Process;
   switch (channel) {
     case version_info::Channel::CANARY:
       return Process::CHANNEL_CANARY;
     case version_info::Channel::DEV:
       return Process::CHANNEL_DEV;
     case version_info::Channel::BETA:
       return Process::CHANNEL_BETA;
     case version_info::Channel::STABLE:
       return Process::CHANNEL_STABLE;
     default:
       return Process::CHANNEL_UNKNOWN;
   }
 }
 
 // Populates |process| with data related to the chrome browser process.
 void CollectProcessData(ClientIncidentReport_EnvironmentData_Process* process) {
-  chrome::VersionInfo version_info;
   // TODO(grt): Move this logic into VersionInfo (it also appears in
   // ChromeMetricsServiceClient).
-  std::string version(version_info.Version());
+  std::string version(version_info::GetVersionNumber());
 #if defined(ARCH_CPU_64_BITS)
   version += "-64";
 #endif  // defined(ARCH_CPU_64_BITS)
-  if (!version_info.IsOfficialBuild())
+  if (!version_info::IsOfficialBuild())
     version += "-devel";
   process->set_version(version);
 
   process->set_chrome_update_channel(
-      MapChannelToProtobuf(chrome::VersionInfo::GetChannel()));
+      MapChannelToProtobuf(chrome::GetChannel()));
 
   CollectPlatformProcessData(process);
 }
 
 }  // namespace
 
 void CollectEnvironmentData(ClientIncidentReport_EnvironmentData* data) {
   // OS
   {
     ClientIncidentReport_EnvironmentData_OS* os = data->mutable_os();
@@ skipping 17 matching lines @@
 
 #if !defined(OS_WIN)
 void CollectPlatformProcessData(
     ClientIncidentReport_EnvironmentData_Process* process) {
   // Empty implementation for platforms that do not (yet) have their own
   // implementations.
 }
 #endif
 
 }  // namespace safe_browsing