Cleanup VersionInfo after componentization.

chrome/browser/ui/webui/version_ui.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/browser/ui/webui/version_ui.h"
 
 #include "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/version_handler.h"
+#include "chrome/common/channel_info.h"
 #include "chrome/common/chrome_content_client.h"
-#include "chrome/common/chrome_version_info.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
+#include "components/version_info/version_info.h"
 #include "content/public/browser/url_data_source.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "content/public/common/user_agent.h"
 #include "grit/browser_resources.h"
 #include "grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "v8/include/v8.h"
 
 #if defined(ENABLE_THEMES)
@@ skipping 13 matching lines @@
 
 namespace {
 
 WebUIDataSource* CreateVersionUIDataSource() {
   WebUIDataSource* html_source =
       WebUIDataSource::Create(chrome::kChromeUIVersionHost);
 
   // Localized and data strings.
   html_source->AddLocalizedString("title", IDS_ABOUT_VERSION_TITLE);
   html_source->AddLocalizedString("application_label", IDS_PRODUCT_NAME);
-  chrome::VersionInfo version_info;
-  html_source->AddString("version", version_info.Version());
-  html_source->AddString("version_modifier",
-                         chrome::VersionInfo::GetVersionStringModifier());
+  html_source->AddString("version", version_info::GetVersionNumber());
+  html_source->AddString("version_modifier", chrome::GetChannelString());
   html_source->AddLocalizedString("os_name", IDS_ABOUT_VERSION_OS);
   html_source->AddLocalizedString("platform", IDS_PLATFORM_LABEL);
-  html_source->AddString("os_type", version_info.OSType());
+  html_source->AddString("os_type", version_info::GetOSType());
   html_source->AddString("blink_version", content::GetWebKitVersion());
   html_source->AddString("js_engine", "V8");
   html_source->AddString("js_version", v8::V8::GetVersion());
 
 #if defined(OS_ANDROID)
   html_source->AddString("os_version", AndroidAboutAppInfo::GetOsInfo());
   html_source->AddLocalizedString("build_id_name",
                                   IDS_ABOUT_VERSION_BUILD_ID);
   html_source->AddString("build_id", CHROME_BUILD_ID);
 #else
   html_source->AddString("os_version", std::string());
   html_source->AddString("flash_plugin", "Flash");
   // Note that the Flash version is retrieve asynchronously and returned in
   // VersionHandler::OnGotPlugins. The area is initially blank.
   html_source->AddString("flash_version", std::string());
 #endif  // defined(OS_ANDROID)
 
   html_source->AddLocalizedString("company", IDS_ABOUT_VERSION_COMPANY_NAME);
   base::Time::Exploded exploded_time;
   base::Time::Now().LocalExplode(&exploded_time);
   html_source->AddString(
       "copyright",
       l10n_util::GetStringFUTF16(IDS_ABOUT_VERSION_COPYRIGHT,
                                  base::IntToString16(exploded_time.year)));
   html_source->AddLocalizedString("revision", IDS_ABOUT_VERSION_REVISION);
-  html_source->AddString("cl", version_info.LastChange());
+  html_source->AddString("cl", version_info::GetLastChange());
   html_source->AddLocalizedString("official",
-      version_info.IsOfficialBuild() ? IDS_ABOUT_VERSION_OFFICIAL :
-                                       IDS_ABOUT_VERSION_UNOFFICIAL);
+                                  version_info::IsOfficialBuild()
+                                      ? IDS_ABOUT_VERSION_OFFICIAL
+                                      : IDS_ABOUT_VERSION_UNOFFICIAL);
 #if defined(ARCH_CPU_64_BITS)
   html_source->AddLocalizedString("version_bitsize", IDS_ABOUT_VERSION_64BIT);
 #else
   html_source->AddLocalizedString("version_bitsize", IDS_ABOUT_VERSION_32BIT);
 #endif
   html_source->AddLocalizedString("user_agent_name",
                                   IDS_ABOUT_VERSION_USER_AGENT);
   html_source->AddString("useragent", GetUserAgent());
   html_source->AddLocalizedString("command_line_name",
                                   IDS_ABOUT_VERSION_COMMAND_LINE);
@@ skipping 50 matching lines @@
   // Set up the chrome://theme/ source.
   ThemeSource* theme = new ThemeSource(profile);
   content::URLDataSource::Add(profile, theme);
 #endif
 
   WebUIDataSource::Add(profile, CreateVersionUIDataSource());
 }
 
 VersionUI::~VersionUI() {
 }