Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1279)

Unified Diff: chrome/browser/browser_process_impl.cc

Issue 1347043002: Move ChromeNetLog to //components (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: DetachFromThread Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/browser_process_impl.cc
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index b685801eb419f624d2785c68122d29d3806999fa..42049c2fd418c05472ec0c7db27cdbe7d30fc150 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -45,7 +45,7 @@
#include "chrome/browser/lifetime/application_lifetime.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"
@@ -77,6 +77,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"
@@ -191,7 +192,11 @@ 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, GetNetCaptureMode(),
+ chrome::GetChannelString()));
ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme(
extensions::kExtensionScheme);
@@ -884,7 +889,7 @@ void BrowserProcessImpl::StartAutoupdateTimer() {
}
#endif
-ChromeNetLog* BrowserProcessImpl::net_log() {
+net_log::ChromeNetLog* BrowserProcessImpl::net_log() {
return net_log_.get();
}

Powered by Google App Engine
This is Rietveld 408576698