Move ChromeNetLog to //components

BUG=508071
TBR=jochen

Review URL: https://codereview.chromium.org/1347043002

Cr-Commit-Position: refs/heads/master@{#349928}

chrome/browser/BUILD.gn

@@ -284,6 +284,7 @@ source_set("browser") {
       "//components/history/content/browser",
       "//components/keyed_service/content",
       "//components/navigation_interception",
+      "//components/net_log",
       "//components/network_hints/common",
       "//components/password_manager/content/browser",
       "//components/password_manager/sync/browser",

chrome/browser/DEPS

@@ -58,6 +58,7 @@ include_rules = [
   "+components/nacl/common",
   "+components/navigation_interception",
   "+components/navigation_metrics",
+  "+components/net_log",
   "+components/network_hints",
   "+components/network_time",
   "+components/offline_pages",

chrome/browser/browser_process.h

@@ -19,7 +19,6 @@
 #include "chrome/browser/ui/host_desktop.h"
 
 class BackgroundModeManager;
-class ChromeNetLog;
 class CRLSetFetcher;
 class DownloadRequestLimiter;
 class DownloadStatusUpdater;
@@ -76,6 +75,10 @@ namespace net {
 class URLRequestContextGetter;
 }
 
+namespace net_log {
+class ChromeNetLog;
+}
+
 namespace network_time {
 class NetworkTimeTracker;
 }
@@ -223,7 +226,7 @@ class BrowserProcess {
   virtual void StartAutoupdateTimer() = 0;
 #endif
 
-  virtual ChromeNetLog* net_log() = 0;
+  virtual net_log::ChromeNetLog* net_log() = 0;
 
   virtual component_updater::ComponentUpdateService* component_updater() = 0;
 

chrome/browser/browser_process_impl.cc

@@ -46,7 +46,7 @@
 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
 #include "chrome/browser/metrics/metrics_services_manager.h"
 #include "chrome/browser/metrics/thread_watcher.h"
-#include "chrome/browser/net/chrome_net_log.h"
+#include "chrome/browser/net/chrome_net_log_helper.h"
 #include "chrome/browser/net/crl_set_fetcher.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/plugins/chrome_plugin_service_filter.h"
@@ -78,6 +78,7 @@
 #include "components/component_updater/component_updater_service.h"
 #include "components/gcm_driver/gcm_driver.h"
 #include "components/metrics/metrics_service.h"
+#include "components/net_log/chrome_net_log.h"
 #include "components/network_time/network_time_tracker.h"
 #include "components/policy/core/common/policy_service.h"
 #include "components/safe_json/safe_json_parser.h"
@@ -192,7 +193,12 @@ BrowserProcessImpl::BrowserProcessImpl(
   print_job_manager_.reset(new printing::PrintJobManager);
 #endif
 
-  net_log_.reset(new ChromeNetLog);
+  base::FilePath net_log_path;
+  if (command_line.HasSwitch(switches::kLogNetLog))
+    net_log_path = command_line.GetSwitchValuePath(switches::kLogNetLog);
+  net_log_.reset(new net_log::ChromeNetLog(
+      net_log_path, GetNetCaptureModeFromCommandLine(command_line),
+      command_line.GetCommandLineString(), chrome::GetChannelString()));
 
   ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme(
       extensions::kExtensionScheme);
@@ -885,7 +891,7 @@ void BrowserProcessImpl::StartAutoupdateTimer() {
 }
 #endif
 
-ChromeNetLog* BrowserProcessImpl::net_log() {
+net_log::ChromeNetLog* BrowserProcessImpl::net_log() {
   return net_log_.get();
 }
 

chrome/browser/browser_process_impl.h

@@ -23,7 +23,6 @@
 
 class ChromeChildProcessWatcher;
 class ChromeDeviceClient;
-class ChromeNetLog;
 class ChromeResourceDispatcherHostDelegate;
 class RemoteDebuggingServer;
 class PrefRegistrySimple;
@@ -45,6 +44,10 @@ namespace gcm {
 class GCMDriver;
 }
 
+namespace net_log {
+class ChromeNetLog;
+}
+
 namespace policy {
 class BrowserPolicyConnector;
 class PolicyService;
@@ -128,7 +131,7 @@ class BrowserProcessImpl : public BrowserProcess,
   void StartAutoupdateTimer() override;
 #endif
 
-  ChromeNetLog* net_log() override;
+  net_log::ChromeNetLog* net_log() override;
   component_updater::ComponentUpdateService* component_updater() override;
   CRLSetFetcher* crl_set_fetcher() override;
   component_updater::PnaclComponentInstaller* pnacl_component_installer()
@@ -260,7 +263,7 @@ class BrowserProcessImpl : public BrowserProcess,
   PrefChangeRegistrar pref_change_registrar_;
 
   // Lives here so can safely log events on shutdown.
-  scoped_ptr<ChromeNetLog> net_log_;
+  scoped_ptr<net_log::ChromeNetLog> net_log_;
 
   scoped_ptr<ChromeResourceDispatcherHostDelegate>
       resource_dispatcher_host_delegate_;

chrome/browser/chrome_browser_main.cc

@@ -65,7 +65,6 @@
 #include "chrome/browser/metrics/metrics_services_manager.h"
 #include "chrome/browser/metrics/thread_watcher.h"
 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h"
-#include "chrome/browser/net/chrome_net_log.h"
 #include "chrome/browser/net/crl_set_fetcher.h"
 #include "chrome/browser/performance_monitor/performance_monitor.h"
 #include "chrome/browser/plugins/plugin_prefs.h"

chrome/browser/chrome_content_browser_client.cc

@@ -44,7 +44,6 @@
 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
 #include "chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h"
 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h"
-#include "chrome/browser/net/chrome_net_log.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/notifications/platform_notification_service_impl.h"
@@ -105,6 +104,7 @@
 #include "components/dom_distiller/core/url_constants.h"
 #include "components/google/core/browser/google_util.h"
 #include "components/metrics/client_info.h"
+#include "components/net_log/chrome_net_log.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/rappor/rappor_utils.h"
 #include "components/signin/core/common/profile_management_switches.h"

chrome/browser/download/download_service_impl.cc

@@ -11,7 +11,6 @@
 #include "chrome/browser/download/download_status_updater.h"
 #include "chrome/browser/download/download_ui_controller.h"
 #include "chrome/browser/history/history_service_factory.h"
-#include "chrome/browser/net/chrome_net_log.h"
 #include "chrome/browser/profiles/profile.h"
 #include "components/history/core/browser/history_service.h"
 #include "content/public/browser/download_manager.h"

chrome/browser/extensions/api/dial/dial_registry.cc

@@ -13,8 +13,8 @@
 #include "chrome/browser/extensions/api/dial/dial_api.h"
 #include "chrome/browser/extensions/api/dial/dial_device_data.h"
 #include "chrome/browser/extensions/api/dial/dial_service.h"
-#include "chrome/browser/net/chrome_net_log.h"
 #include "chrome/common/extensions/api/dial.h"
+#include "components/net_log/chrome_net_log.h"
 
 using base::Time;
 using base::TimeDelta;

chrome/browser/extensions/api/log_private/log_private_api.h

@@ -83,7 +83,7 @@ class LogPrivateAPI : public BrowserContextKeyedAPI,
                            const Extension* extension,
                            UnloadedExtensionInfo::Reason reason) override;
 
-  // ChromeNetLog::ThreadSafeObserver implementation:
+  // NetLog::ThreadSafeObserver implementation:
   void OnAddEntry(const net::NetLog::Entry& entry) override;
 
   void PostPendingEntries();

chrome/browser/extensions/api/log_private/log_private_api_chromeos.cc

@@ -22,11 +22,11 @@
 #include "chrome/browser/extensions/api/log_private/syslog_parser.h"
 #include "chrome/browser/feedback/system_logs/scrubbed_system_logs_fetcher.h"
 #include "chrome/browser/io_thread.h"
-#include "chrome/browser/net/chrome_net_log.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/extensions/api/log_private.h"
 #include "chrome/common/logging_chrome.h"
+#include "components/net_log/chrome_net_log.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "extensions/browser/event_router.h"

chrome/browser/extensions/chrome_extensions_browser_client.cc

@@ -27,7 +27,6 @@
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/extensions/menu_manager.h"
 #include "chrome/browser/external_protocol/external_protocol_handler.h"
-#include "chrome/browser/net/chrome_net_log.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/task_management/web_contents_tags.h"
@@ -36,6 +35,7 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/features/feature_channel.h"
 #include "chrome/common/pref_names.h"
+#include "components/net_log/chrome_net_log.h"
 #include "components/version_info/version_info.h"
 #include "content/public/browser/render_process_host.h"
 #include "extensions/browser/api/generated_api_registration.h"

chrome/browser/io_thread.cc

@@ -30,7 +30,6 @@
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/net/async_dns_field_trial.h"
-#include "chrome/browser/net/chrome_net_log.h"
 #include "chrome/browser/net/chrome_network_delegate.h"
 #include "chrome/browser/net/connect_interceptor.h"
 #include "chrome/browser/net/dns_probe_service.h"
@@ -41,6 +40,7 @@
 #include "chrome/common/pref_names.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_prefs.h"
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h"
+#include "components/net_log/chrome_net_log.h"
 #include "components/policy/core/common/policy_service.h"
 #include "components/proxy_config/pref_proxy_config_tracker.h"
 #include "components/variations/variations_associated_data.h"
@@ -421,7 +421,7 @@ IOThread::Globals::~Globals() {}
 IOThread::IOThread(
     PrefService* local_state,
     policy::PolicyService* policy_service,
-    ChromeNetLog* net_log,
+    net_log::ChromeNetLog* net_log,
     extensions::EventRouterForwarder* extension_event_router_forwarder)
     : net_log_(net_log),
 #if defined(ENABLE_EXTENSIONS)
@@ -509,7 +509,7 @@ void IOThread::SetGlobalsForTesting(Globals* globals) {
   globals_ = globals;
 }
 
-ChromeNetLog* IOThread::net_log() {
+net_log::ChromeNetLog* IOThread::net_log() {
   return net_log_;
 }
 

chrome/browser/io_thread.h

@@ -26,7 +26,6 @@
 #include "net/http/http_network_session.h"
 #include "net/socket/next_proto.h"
 
-class ChromeNetLog;
 class PrefProxyConfigTracker;
 class PrefService;
 class PrefRegistrySimple;
@@ -70,6 +69,10 @@ class URLRequestJobFactory;
 class URLSecurityManager;
 }  // namespace net
 
+namespace net_log {
+class ChromeNetLog;
+}
+
 namespace policy {
 class PolicyService;
 }  // namespace policy
@@ -210,7 +213,7 @@ class IOThread : public content::BrowserThreadDelegate {
   // |net_log| must either outlive the IOThread or be NULL.
   IOThread(PrefService* local_state,
            policy::PolicyService* policy_service,
-           ChromeNetLog* net_log,
+           net_log::ChromeNetLog* net_log,
            extensions::EventRouterForwarder* extension_event_router_forwarder);
 
   ~IOThread() override;
@@ -225,7 +228,7 @@ class IOThread : public content::BrowserThreadDelegate {
   // IOThread global objects.
   void SetGlobalsForTesting(Globals* globals);
 
-  ChromeNetLog* net_log();
+  net_log::ChromeNetLog* net_log();
 
   // Handles changing to On The Record mode, discarding confidential data.
   void ChangedToOnTheRecord();
@@ -447,7 +450,7 @@ class IOThread : public content::BrowserThreadDelegate {
 
   // The NetLog is owned by the browser process, to allow logging from other
   // threads during shutdown, but is used most frequently on the IOThread.
-  ChromeNetLog* net_log_;
+  net_log::ChromeNetLog* net_log_;
 
 #if defined(ENABLE_EXTENSIONS)
   // The extensions::EventRouterForwarder allows for sending events to

chrome/browser/media/cast_transport_host_filter.cc

@@ -6,8 +6,8 @@
 
 #include "base/thread_task_runner_handle.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/net/chrome_net_log.h"
 #include "chrome/common/cast_messages.h"
+#include "components/net_log/chrome_net_log.h"
 #include "content/public/browser/power_save_blocker.h"
 #include "media/cast/net/cast_transport_sender.h"