Cleanup VersionInfo after componentization.

chrome/browser/media/webrtc_logging_handler_host.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/media/webrtc_logging_handler_host.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/cpu.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/sys_info.h"
 #include "base/time/time.h"
 #include "chrome/browser/bad_message.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/media/webrtc_log_list.h"
 #include "chrome/browser/media/webrtc_log_uploader.h"
 #include "chrome/browser/media/webrtc_rtp_dump_handler.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 "chrome/common/media/webrtc_logging_messages.h"
 #include "chromeos/settings/cros_settings_names.h"
+#include "components/version_info/version_info.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/public/browser/render_process_host.h"
 #include "gpu/config/gpu_info.h"
 #include "net/base/address_family.h"
 #include "net/base/ip_address_number.h"
 #include "net/url_request/url_request_context_getter.h"
 
 #if defined(OS_LINUX)
@@ skipping 527 matching lines @@
       now.day_of_month, now.hour, now.minute, now.second));
 
   // Write metadata if received before logging started.
   if (meta_data_.get() && !meta_data_->empty()) {
     std::string info;
     FormatMetaDataAsLogMessage(*meta_data_.get(), &info);
     LogToCircularBuffer(info);
   }
 
   // Chrome version
-  chrome::VersionInfo version_info;
-  LogToCircularBuffer("Chrome version: " + version_info.Version() + " " +
-                      chrome::VersionInfo::GetVersionStringModifier());
+  LogToCircularBuffer("Chrome version: " + version_info::GetVersionNumber() +
+                      " " + chrome::GetChannelString());
 
   // OS
   LogToCircularBuffer(base::SysInfo::OperatingSystemName() + " " +
                       base::SysInfo::OperatingSystemVersion() + " " +
                       base::SysInfo::OperatingSystemArchitecture());
 #if defined(OS_LINUX)
   LogToCircularBuffer("Linux distribution: " + base::GetLinuxDistro());
 #endif
 
   // CPU
@@ skipping 174 matching lines @@
   WebRtcRtpDumpHandler::ReleasedDumps rtp_dumps(
       rtp_dump_handler_->ReleaseDumps());
   log_paths->incoming_rtp_dump = rtp_dumps.incoming_dump_path;
   log_paths->outgoing_rtp_dump = rtp_dumps.outgoing_dump_path;
 
   rtp_dump_handler_.reset();
   stop_rtp_dump_callback_.Reset();
 
   return true;
 }