Move ChromeNetLog to //components

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 15 matching lines @@
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_remover.h"
 #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/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/net_log/chrome_net_log.h"
 #include "components/onc/onc_constants.h"
 #include "components/url_formatter/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"
@@ skipping 234 matching lines @@
   void OnHSTSAdd(const base::ListValue* list);
   void OnHSTSDelete(const base::ListValue* list);
   void OnGetSessionNetworkStats(const base::ListValue* list);
   void OnCloseIdleSockets(const base::ListValue* list);
   void OnFlushSocketPools(const base::ListValue* list);
 #if defined(OS_WIN)
   void OnGetServiceProviders(const base::ListValue* list);
 #endif
   void OnSetCaptureMode(const base::ListValue* list);
 
-  // ChromeNetLog::ThreadSafeObserver implementation:
+  // NetLog::ThreadSafeObserver implementation:
   void OnAddEntry(const net::NetLog::Entry& entry) override;
 
   // Helper that calls g_browser.receive in the renderer, passing in |command|
   // and |arg|.  Takes ownership of |arg|.  If the renderer is displaying a log
   // file, the message will be ignored.  Note that this can be called from any
   // thread.
   void SendJavascriptCommand(const std::string& command, base::Value* arg);
 
  private:
   friend struct BrowserThread::DeleteOnThread<BrowserThread::UI>;
@@ skipping 351 matching lines @@
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   // If currently watching the NetLog, temporarily stop watching it and flush
   // pending events, so they won't appear before the status events created for
   // currently active network objects below.
   if (net_log()) {
     net_log()->DeprecatedRemoveObserver(this);
     PostPendingEntries();
   }
 
-  SendJavascriptCommand("receivedConstants", NetInternalsUI::GetConstants());
+  SendJavascriptCommand(
+      "receivedConstants",
+      net_log::ChromeNetLog::GetConstants(
+          base::CommandLine::ForCurrentProcess()->GetCommandLineString(),
+          chrome::GetChannelString()));
 
   PrePopulateEventList();
 
   // Register with network stack to observe events.
   io_thread_->net_log()->DeprecatedAddObserver(
       this, net::NetLogCaptureMode::IncludeCookiesAndCredentials());
 }
 
 void NetInternalsMessageHandler::IOThreadImpl::OnGetNetInfo(
     const base::ListValue* list) {
@@ skipping 468 matching lines @@
 
 }  // namespace
 
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // NetInternalsUI
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-// 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();
-
-    // We have everything we need to send the right values.
-    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());
 }