mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

GetNetCaptureModeFromCommandLine moved to net

Browse source 
1614697
This commit is contained in:
Jeremy Apthorp 2019-05-21 11:39:33 -07:00
parent 79f62cc1aa
commit e96f9c06f0
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
atom/browser/browser_process_impl.cc
View file

@ -6,7 +6,6 @@
#include <utility> #include <utility>
#include "chrome/browser/net/chrome_net_log_helper.h"
#include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_switches.h"
#include "components/net_log/chrome_net_log.h" #include "components/net_log/chrome_net_log.h"
#include "components/net_log/net_export_file_writer.h" #include "components/net_log/net_export_file_writer.h"
@ -19,6 +18,7 @@
#include "components/proxy_config/proxy_config_dictionary.h" #include "components/proxy_config/proxy_config_dictionary.h"
#include "components/proxy_config/proxy_config_pref_names.h" #include "components/proxy_config/proxy_config_pref_names.h"
#include "content/public/common/content_switches.h" #include "content/public/common/content_switches.h"
#include "net/log/net_log_capture_mode.h"
#include "net/proxy_resolution/proxy_config.h" #include "net/proxy_resolution/proxy_config.h"
#include "net/proxy_resolution/proxy_config_service.h" #include "net/proxy_resolution/proxy_config_service.h"
#include "net/proxy_resolution/proxy_config_with_annotation.h" #include "net/proxy_resolution/proxy_config_with_annotation.h"
@ -105,7 +105,9 @@ void BrowserProcessImpl::PreCreateThreads(
command_line.GetSwitchValuePath(network::switches::kLogNetLog); command_line.GetSwitchValuePath(network::switches::kLogNetLog);
if (!log_file.empty()) { if (!log_file.empty()) {
net_log_->StartWritingToFile( net_log_->StartWritingToFile(
log_file, GetNetCaptureModeFromCommandLine(command_line), log_file,
net::GetNetCaptureModeFromCommandLine(
command_line, network::switches::kNetLogCaptureMode),
command_line.GetCommandLineString(), std::string()); command_line.GetCommandLineString(), std::string());
} }
} }

2
chromium_src/BUILD.gn
View file

@ -33,8 +33,6 @@ static_library("chrome") {
"//chrome/browser/icon_manager.h", "//chrome/browser/icon_manager.h",
"//chrome/browser/net/chrome_mojo_proxy_resolver_factory.cc", "//chrome/browser/net/chrome_mojo_proxy_resolver_factory.cc",
"//chrome/browser/net/chrome_mojo_proxy_resolver_factory.h", "//chrome/browser/net/chrome_mojo_proxy_resolver_factory.h",
"//chrome/browser/net/chrome_net_log_helper.cc",
"//chrome/browser/net/chrome_net_log_helper.h",
"//chrome/browser/net/proxy_config_monitor.cc", "//chrome/browser/net/proxy_config_monitor.cc",
"//chrome/browser/net/proxy_config_monitor.h", "//chrome/browser/net/proxy_config_monitor.h",
"//chrome/browser/net/proxy_service_factory.cc", "//chrome/browser/net/proxy_service_factory.cc",