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

Unified Diff: ios/components/io_thread/ios_io_thread.mm

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 | « ios/components/io_thread/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/components/io_thread/ios_io_thread.mm
diff --git a/ios/components/io_thread/ios_io_thread.mm b/ios/components/io_thread/ios_io_thread.mm
index 5eed9c1e633e872949bbd5ceb0a273307750cbf7..84185887ef3943fc39f47cda595338c52fb323bf 100644
--- a/ios/components/io_thread/ios_io_thread.mm
+++ b/ios/components/io_thread/ios_io_thread.mm
@@ -11,6 +11,7 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
+#include "base/command_line.h"
#include "base/compiler_specific.h"
#include "base/debug/leak_tracker.h"
#include "base/environment.h"
@@ -27,7 +28,7 @@
#include "base/time/time.h"
#include "base/trace_event/trace_event.h"
#include "components/net_log/chrome_net_log.h"
-#include "components/network_session_configurator/network_session_configurator.h"
+#include "components/network_session_configurator/browser/network_session_configurator.h"
#include "components/prefs/pref_service.h"
#include "components/proxy_config/ios/proxy_service_factory.h"
#include "components/proxy_config/pref_proxy_config_tracker.h"
@@ -347,9 +348,10 @@ void IOSIOThread::Init() {
quic_user_agent_id.push_back(' ');
quic_user_agent_id.append(web::BuildOSCpuInfo());
- network_session_configurator::ParseFieldTrials(
- /*is_quic_force_disabled=*/false,
- /*is_quic_force_enabled=*/false, quic_user_agent_id, &params_);
+ // Set up field trials, ignoring debug command line options.
+ network_session_configurator::ParseCommandLineAndFieldTrials(
+ base::CommandLine(base::CommandLine::NO_PROGRAM),
+ /*is_quic_force_disabled=*/false, quic_user_agent_id, &params_);
// InitSystemRequestContext turns right around and posts a task back
// to the IO thread, so we can't let it run until we know the IO
« no previous file with comments | « ios/components/io_thread/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698