Cleanup VersionInfo after componentization.

chrome/browser/ui/webui/net_internals/net_internals_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/net_internals/net_internals_ui.h"
 
 #include <algorithm>
 #include <list>
 #include <string>
 #include <utility>
@@ skipping 22 matching lines @@
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/net/chrome_net_log.h"
 #include "chrome/browser/net/chrome_network_delegate.h"
 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h"
 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_factory.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_manager_factory.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/common/channel_info.h"
 #include "chrome/common/chrome_paths.h"
-#include "chrome/common/chrome_version_info.h"
 #include "chrome/common/url_constants.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_service.h"
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_event_store.h"
 #include "components/onc/onc_constants.h"
 #include "components/url_fixer/url_fixer.h"
+#include "components/version_info/version_info.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/resource_dispatcher_host.h"
 #include "content/public/browser/web_contents.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 "grit/net_internals_resources.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
@@ skipping 1102 matching lines @@
 // static
 base::Value* NetInternalsUI::GetConstants() {
   scoped_ptr<base::DictionaryValue> constants_dict = net::GetNetConstants();
   DCHECK(constants_dict);
 
   // Add a dictionary with the version of the client and its command line
   // arguments.
   {
     base::DictionaryValue* dict = new base::DictionaryValue();
 
-    chrome::VersionInfo version_info;
-
     // We have everything we need to send the right values.
-    dict->SetString("name", version_info.Name());
-    dict->SetString("version", version_info.Version());
-    dict->SetString("cl", version_info.LastChange());
-    dict->SetString("version_mod",
-                    chrome::VersionInfo::GetVersionStringModifier());
-    dict->SetString("official",
-                    version_info.IsOfficialBuild() ? "official" : "unofficial");
-    dict->SetString("os_type", version_info.OSType());
+    dict->SetString("name", version_info::GetProductName());
+    dict->SetString("version", version_info::GetVersionNumber());
+    dict->SetString("cl", version_info::GetLastChange());
+    dict->SetString("version_mod", chrome::GetChannelString());
+    dict->SetString("official", version_info::IsOfficialBuild() ? "official"
+                                                                : "unofficial");
+    dict->SetString("os_type", version_info::GetOSType());
     dict->SetString(
         "command_line",
         base::CommandLine::ForCurrentProcess()->GetCommandLineString());
 
     constants_dict->Set("clientInfo", dict);
 
     data_reduction_proxy::DataReductionProxyEventStore::AddConstants(
         constants_dict.get());
   }
 
   return constants_dict.release();
 }
 
 NetInternalsUI::NetInternalsUI(content::WebUI* web_ui)
     : WebUIController(web_ui) {
   web_ui->AddMessageHandler(new NetInternalsMessageHandler());
 
   // Set up the chrome://net-internals/ source.
   Profile* profile = Profile::FromWebUI(web_ui);
   content::WebUIDataSource::Add(profile, CreateNetInternalsHTMLSource());
 }