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

Side by Side Diff: chrome/browser/io_thread.cc

Issue 2656693003: Merge 2617c4a136497244376e1bcf11aa356afb2a1e06 (Closed)
Patch Set: fix Created 3 years, 11 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 unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/net/errorpage_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/io_thread.h" 5 #include "chrome/browser/io_thread.h"
6 6
7 #include <utility> 7 #include <utility>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/base64.h" 10 #include "base/base64.h"
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 PrefService* local_state, 316 PrefService* local_state,
317 policy::PolicyService* policy_service, 317 policy::PolicyService* policy_service,
318 net_log::ChromeNetLog* net_log, 318 net_log::ChromeNetLog* net_log,
319 extensions::EventRouterForwarder* extension_event_router_forwarder) 319 extensions::EventRouterForwarder* extension_event_router_forwarder)
320 : net_log_(net_log), 320 : net_log_(net_log),
321 #if BUILDFLAG(ENABLE_EXTENSIONS) 321 #if BUILDFLAG(ENABLE_EXTENSIONS)
322 extension_event_router_forwarder_(extension_event_router_forwarder), 322 extension_event_router_forwarder_(extension_event_router_forwarder),
323 #endif 323 #endif
324 globals_(nullptr), 324 globals_(nullptr),
325 is_quic_allowed_by_policy_(true), 325 is_quic_allowed_by_policy_(true),
326 http_09_on_non_default_ports_enabled_(false), 326 http_09_on_non_default_ports_enabled_(true),
327 creation_time_(base::TimeTicks::Now()), 327 creation_time_(base::TimeTicks::Now()),
328 weak_factory_(this) { 328 weak_factory_(this) {
329 scoped_refptr<base::SingleThreadTaskRunner> io_thread_proxy = 329 scoped_refptr<base::SingleThreadTaskRunner> io_thread_proxy =
330 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO); 330 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO);
331 auth_schemes_ = local_state->GetString(prefs::kAuthSchemes); 331 auth_schemes_ = local_state->GetString(prefs::kAuthSchemes);
332 negotiate_disable_cname_lookup_.Init( 332 negotiate_disable_cname_lookup_.Init(
333 prefs::kDisableAuthNegotiateCnameLookup, local_state, 333 prefs::kDisableAuthNegotiateCnameLookup, local_state,
334 base::Bind(&IOThread::UpdateNegotiateDisableCnameLookup, 334 base::Bind(&IOThread::UpdateNegotiateDisableCnameLookup,
335 base::Unretained(this))); 335 base::Unretained(this)));
336 negotiate_disable_cname_lookup_.MoveToThread(io_thread_proxy); 336 negotiate_disable_cname_lookup_.MoveToThread(io_thread_proxy);
(...skipping 738 matching lines...) Expand 10 before | Expand all | Expand 10 after
1075 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the 1075 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the
1076 // system URLRequestContext too. There's no reason this should be tied to a 1076 // system URLRequestContext too. There's no reason this should be tied to a
1077 // profile. 1077 // profile.
1078 return context; 1078 return context;
1079 } 1079 }
1080 1080
1081 const metrics::UpdateUsagePrefCallbackType& 1081 const metrics::UpdateUsagePrefCallbackType&
1082 IOThread::GetMetricsDataUseForwarder() { 1082 IOThread::GetMetricsDataUseForwarder() {
1083 return metrics_data_use_forwarder_; 1083 return metrics_data_use_forwarder_;
1084 } 1084 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/net/errorpage_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698