Cleanup VersionInfo after componentization.

chrome/browser/ui/webui/voice_search_ui.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/ui/webui/voice_search_ui.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/files/file_enumerator.h"
 #include "base/memory/weak_ptr.h"
 #include "base/metrics/field_trial.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/plugins/plugin_prefs.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/hotword_service.h"
 #include "chrome/browser/search/hotword_service_factory.h"
 #include "chrome/browser/ui/app_list/start_page_service.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_paths.h"
-#include "chrome/common/chrome_version_info.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/pref_names.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/browser_thread.h"
 #include "content/public/browser/plugin_service.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/browser/web_ui_message_handler.h"
 #include "content/public/common/user_agent.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
@@ skipping 159 matching lines @@
             raw_list,
             path,
             base::Bind(&VoiceSearchDomHandler::ReturnVoiceSearchInfo,
                        weak_factory_.GetWeakPtr(),
                        base::Passed(list.Pass()))));
   }
 
   // Adds information regarding the system and chrome version info to list.
   void AddOperatingSystemInfo(base::ListValue* list)  {
     // Obtain the Chrome version info.
-    chrome::VersionInfo version_info;
     AddPair(list,
             l10n_util::GetStringUTF8(IDS_PRODUCT_NAME),
-            version_info.Version() + " (" +
-            chrome::VersionInfo::GetVersionStringModifier() + ")");
+            version_info::GetVersionNumber() + " (" +
+            chrome::GetChannelString() + ")");
 
     // OS version information.
-    std::string os_label = version_info.OSType();
+    std::string os_label = version_info::GetOSType();
 #if defined(OS_WIN)
     base::win::OSInfo* os = base::win::OSInfo::GetInstance();
     switch (os->version()) {
       case base::win::VERSION_XP:
         os_label += " XP";
         break;
       case base::win::VERSION_SERVER_2003:
         os_label += " Server 2003 or XP Pro 64 bit";
         break;
       case base::win::VERSION_VISTA:
@@ skipping 204 matching lines @@
 VoiceSearchUI::VoiceSearchUI(content::WebUI* web_ui)
     : content::WebUIController(web_ui) {
   Profile* profile = Profile::FromWebUI(web_ui);
   web_ui->AddMessageHandler(new VoiceSearchDomHandler(profile));
 
   // Set up the about:voicesearch source.
   content::WebUIDataSource::Add(profile, CreateVoiceSearchUiHtmlSource());
 }
 
 VoiceSearchUI::~VoiceSearchUI() {}