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

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

Issue 533003002: Use chromium version for data reduction proxy version (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 | « chrome/browser/io_thread.cc ('k') | components/data_reduction_proxy.gypi » ('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/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 13 matching lines...) Expand all
24 #include "chrome/browser/net/chrome_network_delegate.h" 24 #include "chrome/browser/net/chrome_network_delegate.h"
25 #include "chrome/browser/net/connect_interceptor.h" 25 #include "chrome/browser/net/connect_interceptor.h"
26 #include "chrome/browser/net/cookie_store_util.h" 26 #include "chrome/browser/net/cookie_store_util.h"
27 #include "chrome/browser/net/http_server_properties_manager_factory.h" 27 #include "chrome/browser/net/http_server_properties_manager_factory.h"
28 #include "chrome/browser/net/predictor.h" 28 #include "chrome/browser/net/predictor.h"
29 #include "chrome/browser/net/quota_policy_channel_id_store.h" 29 #include "chrome/browser/net/quota_policy_channel_id_store.h"
30 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator. h" 30 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator. h"
31 #include "chrome/browser/profiles/profile.h" 31 #include "chrome/browser/profiles/profile.h"
32 #include "chrome/common/chrome_constants.h" 32 #include "chrome/common/chrome_constants.h"
33 #include "chrome/common/chrome_switches.h" 33 #include "chrome/common/chrome_switches.h"
34 #include "chrome/common/chrome_version_info.h"
35 #include "chrome/common/pref_names.h" 34 #include "chrome/common/pref_names.h"
36 #include "chrome/common/url_constants.h" 35 #include "chrome/common/url_constants.h"
37 #include "components/data_reduction_proxy/browser/data_reduction_proxy_statistic s_prefs.h" 36 #include "components/data_reduction_proxy/browser/data_reduction_proxy_statistic s_prefs.h"
38 #include "components/domain_reliability/monitor.h" 37 #include "components/domain_reliability/monitor.h"
39 #include "content/public/browser/browser_thread.h" 38 #include "content/public/browser/browser_thread.h"
40 #include "content/public/browser/cookie_store_factory.h" 39 #include "content/public/browser/cookie_store_factory.h"
41 #include "content/public/browser/notification_service.h" 40 #include "content/public/browser/notification_service.h"
42 #include "content/public/browser/resource_context.h" 41 #include "content/public/browser/resource_context.h"
43 #include "content/public/browser/storage_partition.h" 42 #include "content/public/browser/storage_partition.h"
44 #include "extensions/browser/extension_protocols.h" 43 #include "extensions/browser/extension_protocols.h"
(...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after
436 content::URLRequestInterceptorScopedVector request_interceptors) const { 435 content::URLRequestInterceptorScopedVector request_interceptors) const {
437 net::URLRequestContext* main_context = main_request_context(); 436 net::URLRequestContext* main_context = main_request_context();
438 437
439 IOThread* const io_thread = profile_params->io_thread; 438 IOThread* const io_thread = profile_params->io_thread;
440 IOThread::Globals* const io_thread_globals = io_thread->globals(); 439 IOThread::Globals* const io_thread_globals = io_thread->globals();
441 440
442 #if defined(SPDY_PROXY_AUTH_ORIGIN) 441 #if defined(SPDY_PROXY_AUTH_ORIGIN)
443 data_reduction_proxy_auth_request_handler_.reset( 442 data_reduction_proxy_auth_request_handler_.reset(
444 new data_reduction_proxy::DataReductionProxyAuthRequestHandler( 443 new data_reduction_proxy::DataReductionProxyAuthRequestHandler(
445 DataReductionProxyChromeSettings::GetClient(), 444 DataReductionProxyChromeSettings::GetClient(),
446 chrome::VersionInfo().Version(),
447 data_reduction_proxy_params_.get(), 445 data_reduction_proxy_params_.get(),
448 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO))); 446 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)));
449 data_reduction_proxy_usage_stats_.reset( 447 data_reduction_proxy_usage_stats_.reset(
450 new data_reduction_proxy::DataReductionProxyUsageStats( 448 new data_reduction_proxy::DataReductionProxyUsageStats(
451 data_reduction_proxy_params_.get(), 449 data_reduction_proxy_params_.get(),
452 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI) 450 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI)
453 .get())); 451 .get()));
454 data_reduction_proxy_usage_stats_->set_unavailable_callback( 452 data_reduction_proxy_usage_stats_->set_unavailable_callback(
455 data_reduction_proxy_unavailable_callback_); 453 data_reduction_proxy_unavailable_callback_);
456 454
(...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after
841 const base::Closure& completion) { 839 const base::Closure& completion) {
842 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 840 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
843 DCHECK(initialized()); 841 DCHECK(initialized());
844 842
845 DCHECK(transport_security_state()); 843 DCHECK(transport_security_state());
846 // Completes synchronously. 844 // Completes synchronously.
847 transport_security_state()->DeleteAllDynamicDataSince(time); 845 transport_security_state()->DeleteAllDynamicDataSince(time);
848 DCHECK(http_server_properties_manager_); 846 DCHECK(http_server_properties_manager_);
849 http_server_properties_manager_->Clear(completion); 847 http_server_properties_manager_->Clear(completion);
850 } 848 }
OLDNEW
« no previous file with comments | « chrome/browser/io_thread.cc ('k') | components/data_reduction_proxy.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698