Cleanup VersionInfo after componentization.

chrome/app/chrome_main_delegate.cc

 // Copyright (c) 2012 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/app/chrome_main_delegate.h"
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/cpu.h"
 #include "base/files/file_path.h"
 #include "base/i18n/rtl.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/statistics_recorder.h"
 #include "base/path_service.h"
 #include "base/process/memory.h"
 #include "base/process/process_handle.h"
 #include "base/strings/string_util.h"
 #include "base/trace_event/trace_event_impl.h"
 #include "build/build_config.h"
 #include "chrome/browser/chrome_content_browser_client.h"
 #include "chrome/browser/defaults.h"
+#include "chrome/common/channel_info.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_paths_internal.h"
 #include "chrome/common/chrome_result_codes.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/chrome_version_info.h"
 #include "chrome/common/crash_keys.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/profiling.h"
 #include "chrome/common/switch_utils.h"
 #include "chrome/common/trace_event_args_whitelist.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/plugin/chrome_content_plugin_client.h"
 #include "chrome/renderer/chrome_content_renderer_client.h"
 #include "chrome/utility/chrome_content_utility_client.h"
 #include "components/component_updater/component_updater_paths.h"
 #include "components/content_settings/core/common/content_settings_pattern.h"
 #include "components/startup_metric_utils/startup_metric_utils.h"
+#include "components/version_info/version_info.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_paths.h"
 #include "extensions/common/constants.h"
 #include "ui/base/ui_base_switches.h"
 
 #if defined(OS_WIN)
 #include <atlbase.h>
 #include <malloc.h>
 #include <algorithm>
 #include "chrome/app/close_handle_hook_win.h"
@@ skipping 213 matching lines @@
       process_type == switches::kGpuProcess ||
 #endif
       process_type == switches::kRendererProcess ||
       process_type == switches::kUtilityProcess;
 }
 
 #if defined(OS_POSIX)
 // Check for --version and --product-version; return true if we encountered
 // one of these switches and should exit now.
 bool HandleVersionSwitches(const base::CommandLine& command_line) {
-  const chrome::VersionInfo version_info;
-
 #if !defined(OS_MACOSX)
   if (command_line.HasSwitch(switches::kProductVersion)) {
-    printf("%s\n", version_info.Version().c_str());
+    printf("%s\n", version_info::GetVersionNumber().c_str());
     return true;
   }
 #endif
 
   if (command_line.HasSwitch(switches::kVersion)) {
     printf("%s %s %s\n",
-           version_info.Name().c_str(),
-           version_info.Version().c_str(),
-           chrome::VersionInfo::GetVersionStringModifier().c_str());
+           version_info::GetProductName().c_str(),
+           version_info::GetVersionNumber().c_str(),
+           chrome::GetChannelString().c_str());
     return true;
   }
 
   return false;
 }
 
 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
 // Show the man page if --help or -h is on the command line.
 void HandleHelpSwitches(const base::CommandLine& command_line) {
   if (command_line.HasSwitch(switches::kHelp) ||
@@ skipping 674 matching lines @@
 content::ContentUtilityClient*
 ChromeMainDelegate::CreateContentUtilityClient() {
 #if defined(CHROME_MULTIPLE_DLL_BROWSER)
   return NULL;
 #else
   return g_chrome_content_utility_client.Pointer();
 #endif
 }
 
 bool ChromeMainDelegate::ShouldEnableProfilerRecording() {
-  switch (chrome::VersionInfo::GetChannel()) {
+  switch (chrome::GetChannel()) {
     case version_info::Channel::UNKNOWN:
     case version_info::Channel::CANARY:
       return true;
     case version_info::Channel::DEV:
     case version_info::Channel::BETA:
     case version_info::Channel::STABLE:
     default:
       // Don't enable instrumentation.
       return false;
   }
 }