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

Unified Diff: content/browser/utility_process_host_impl.cc

Issue 2914893002: Move some of IOThread's command line logic to network_session_configurator. (Closed)
Patch Set: Fix merge Created 3 years, 6 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
« no previous file with comments | « content/browser/site_per_process_browsertest.cc ('k') | content/network/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/utility_process_host_impl.cc
diff --git a/content/browser/utility_process_host_impl.cc b/content/browser/utility_process_host_impl.cc
index baafcdeb88284e668bfe39a4ec63acfbff994cdd..b670a07c6a9e806332c5841d5c7c20a7a546dbcb 100644
--- a/content/browser/utility_process_host_impl.cc
+++ b/content/browser/utility_process_host_impl.cc
@@ -22,6 +22,7 @@
#include "base/synchronization/lock.h"
#include "base/synchronization/waitable_event.h"
#include "build/build_config.h"
+#include "components/network_session_configurator/common/network_switches.h"
#include "content/browser/browser_child_process_host_impl.h"
#include "content/browser/renderer_host/render_process_host_impl.h"
#include "content/browser/service_manager/service_manager_context.h"
@@ -303,13 +304,10 @@ bool UtilityProcessHostImpl::StartProcess() {
static const char* const kSwitchNames[] = {
switches::kEnableNetworkService,
switches::kHostResolverRules,
- switches::kIgnoreCertificateErrors,
switches::kLogNetLog,
switches::kNoSandbox,
switches::kProfilerTiming,
switches::kProxyServer,
- switches::kTestingFixedHttpPort,
- switches::kTestingFixedHttpsPort,
#if defined(OS_MACOSX)
switches::kEnableSandboxLogging,
#endif
@@ -319,6 +317,9 @@ bool UtilityProcessHostImpl::StartProcess() {
cmd_line->CopySwitchesFrom(browser_command_line, kSwitchNames,
arraysize(kSwitchNames));
+ network_session_configurator::CopyNetworkSwitches(browser_command_line,
+ cmd_line.get());
+
if (has_cmd_prefix) {
// Launch the utility child process with some prefix
// (usually "xterm -e gdb --args").
« no previous file with comments | « content/browser/site_per_process_browsertest.cc ('k') | content/network/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698