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

Side by Side Diff: chrome/browser/profiles/profile_impl_io_data.cc

Issue 556603002: Fix DataReductionProxyUsageStats construction (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | 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/profiles/profile_impl_io_data.h" 5 #include "chrome/browser/profiles/profile_impl_io_data.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/metrics/field_trial.h" 10 #include "base/metrics/field_trial.h"
(...skipping 412 matching lines...) Expand 10 before | Expand all | Expand 10 after
423 423
424 void ProfileImplIOData::InitializeInternal( 424 void ProfileImplIOData::InitializeInternal(
425 ProfileParams* profile_params, 425 ProfileParams* profile_params,
426 content::ProtocolHandlerMap* protocol_handlers, 426 content::ProtocolHandlerMap* protocol_handlers,
427 content::URLRequestInterceptorScopedVector request_interceptors) const { 427 content::URLRequestInterceptorScopedVector request_interceptors) const {
428 net::URLRequestContext* main_context = main_request_context(); 428 net::URLRequestContext* main_context = main_request_context();
429 429
430 IOThread* const io_thread = profile_params->io_thread; 430 IOThread* const io_thread = profile_params->io_thread;
431 IOThread::Globals* const io_thread_globals = io_thread->globals(); 431 IOThread::Globals* const io_thread_globals = io_thread->globals();
432 432
433 #if defined(SPDY_PROXY_AUTH_ORIGIN) 433 #if defined(SPDY_PROXY_AUTH_ORIGIN)
cjhopman 2014/09/08 21:11:43 I'm guessing we don't have any configuration that
rpetterson 2014/09/08 21:14:52 I suspect you're right or else this would have bee
434 data_reduction_proxy_auth_request_handler_.reset( 434 data_reduction_proxy_auth_request_handler_.reset(
435 new data_reduction_proxy::DataReductionProxyAuthRequestHandler( 435 new data_reduction_proxy::DataReductionProxyAuthRequestHandler(
436 DataReductionProxyChromeSettings::GetClient(), 436 DataReductionProxyChromeSettings::GetClient(),
437 chrome::VersionInfo().Version(), 437 chrome::VersionInfo().Version(),
438 data_reduction_proxy_params_.get(), 438 data_reduction_proxy_params_.get(),
439 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO))); 439 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)));
440 data_reduction_proxy_usage_stats_.reset( 440 data_reduction_proxy_usage_stats_.reset(
441 new data_reduction_proxy::DataReductionProxyUsageStats( 441 new data_reduction_proxy::DataReductionProxyUsageStats(
442 data_reduction_proxy_params_.get(), 442 data_reduction_proxy_params_.get(),
443 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI))); 443 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI)
444 .get()));
444 data_reduction_proxy_usage_stats_->set_unavailable_callback( 445 data_reduction_proxy_usage_stats_->set_unavailable_callback(
445 data_reduction_proxy_unavailable_callback_); 446 data_reduction_proxy_unavailable_callback_);
446 447
447 448
448 network_delegate()->set_data_reduction_proxy_params( 449 network_delegate()->set_data_reduction_proxy_params(
449 data_reduction_proxy_params_.get()); 450 data_reduction_proxy_params_.get());
450 network_delegate()->set_data_reduction_proxy_usage_stats( 451 network_delegate()->set_data_reduction_proxy_usage_stats(
451 data_reduction_proxy_usage_stats_.get()); 452 data_reduction_proxy_usage_stats_.get());
452 network_delegate()->set_data_reduction_proxy_auth_request_handler( 453 network_delegate()->set_data_reduction_proxy_auth_request_handler(
453 data_reduction_proxy_auth_request_handler_.get()); 454 data_reduction_proxy_auth_request_handler_.get());
(...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after
836 const base::Closure& completion) { 837 const base::Closure& completion) {
837 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 838 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
838 DCHECK(initialized()); 839 DCHECK(initialized());
839 840
840 DCHECK(transport_security_state()); 841 DCHECK(transport_security_state());
841 // Completes synchronously. 842 // Completes synchronously.
842 transport_security_state()->DeleteAllDynamicDataSince(time); 843 transport_security_state()->DeleteAllDynamicDataSince(time);
843 DCHECK(http_server_properties_manager_); 844 DCHECK(http_server_properties_manager_);
844 http_server_properties_manager_->Clear(completion); 845 http_server_properties_manager_->Clear(completion);
845 } 846 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698