| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/net/spdyproxy/data_reduction_proxy_chrome_settings.h" | 5 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h" |
| 6 | 6 |
| 7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
| 8 #include "base/prefs/pref_service.h" | 8 #include "base/prefs/pref_service.h" |
| 9 #include "base/prefs/scoped_user_pref_update.h" | 9 #include "base/prefs/scoped_user_pref_update.h" |
| 10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
| 11 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" | 11 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" |
| 12 #include "chrome/browser/prefs/proxy_prefs.h" | 12 #include "chrome/browser/prefs/proxy_prefs.h" |
| 13 #include "chrome/browser/profiles/profile.h" | 13 #include "chrome/browser/profiles/profile.h" |
| 14 #include "chrome/browser/profiles/profile_manager.h" | 14 #include "chrome/browser/profiles/profile_manager.h" |
| 15 #include "chrome/common/pref_names.h" | 15 #include "chrome/common/pref_names.h" |
| 16 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_auth
_request_handler.h" | 16 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_auth
_request_handler.h" |
| 17 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_conf
igurator.h" | 17 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_conf
igurator.h" |
| 18 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_d
ata.h" | 18 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_d
ata.h" |
| 19 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_sett
ings.h" | 19 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_sett
ings.h" |
| 20 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_stat
istics_prefs.h" |
| 20 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_param
s.h" | 21 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_param
s.h" |
| 21 #include "net/url_request/url_request_context_getter.h" | 22 #include "net/url_request/url_request_context_getter.h" |
| 22 | 23 |
| 23 using data_reduction_proxy::Client; | 24 using data_reduction_proxy::Client; |
| 24 using data_reduction_proxy::DataReductionProxyParams; | 25 using data_reduction_proxy::DataReductionProxyParams; |
| 25 using data_reduction_proxy::DataReductionProxySettings; | 26 using data_reduction_proxy::DataReductionProxySettings; |
| 26 | 27 |
| 27 // The Data Reduction Proxy has been turned into a "best effort" proxy, | 28 // The Data Reduction Proxy has been turned into a "best effort" proxy, |
| 28 // meaning it is used only if the effective proxy configuration resolves to | 29 // meaning it is used only if the effective proxy configuration resolves to |
| 29 // DIRECT for a URL. It no longer can be a ProxyConfig in the proxy preference | 30 // DIRECT for a URL. It no longer can be a ProxyConfig in the proxy preference |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 } | 68 } |
| 68 | 69 |
| 69 void DataReductionProxyChromeSettings::InitDataReductionProxySettings( | 70 void DataReductionProxyChromeSettings::InitDataReductionProxySettings( |
| 70 data_reduction_proxy::DataReductionProxyIOData* io_data, | 71 data_reduction_proxy::DataReductionProxyIOData* io_data, |
| 71 PrefService* profile_prefs, | 72 PrefService* profile_prefs, |
| 72 PrefService* local_state_prefs, | 73 PrefService* local_state_prefs, |
| 73 net::URLRequestContextGetter* request_context) { | 74 net::URLRequestContextGetter* request_context) { |
| 74 SetProxyConfigurator(io_data->configurator()); | 75 SetProxyConfigurator(io_data->configurator()); |
| 75 DataReductionProxySettings::InitDataReductionProxySettings( | 76 DataReductionProxySettings::InitDataReductionProxySettings( |
| 76 profile_prefs, | 77 profile_prefs, |
| 78 io_data->PassStatisticsPrefs(), |
| 77 request_context, | 79 request_context, |
| 78 io_data->net_log(), | 80 io_data->net_log(), |
| 79 io_data->event_store()); | 81 io_data->event_store()); |
| 80 DataReductionProxySettings::SetOnDataReductionEnabledCallback( | 82 DataReductionProxySettings::SetOnDataReductionEnabledCallback( |
| 81 base::Bind(&DataReductionProxyChromeSettings::RegisterSyntheticFieldTrial, | 83 base::Bind(&DataReductionProxyChromeSettings::RegisterSyntheticFieldTrial, |
| 82 base::Unretained(this))); | 84 base::Unretained(this))); |
| 83 SetDataReductionProxyAlternativeEnabled( | 85 SetDataReductionProxyAlternativeEnabled( |
| 84 DataReductionProxyParams::IsIncludedInAlternativeFieldTrial()); | 86 DataReductionProxyParams::IsIncludedInAlternativeFieldTrial()); |
| 85 // TODO(bengr): Remove after M46. See http://crbug.com/445599. | 87 // TODO(bengr): Remove after M46. See http://crbug.com/445599. |
| 86 MigrateDataReductionProxyOffProxyPrefs(profile_prefs); | 88 MigrateDataReductionProxyOffProxyPrefs(profile_prefs); |
| (...skipping 25 matching lines...) Expand all Loading... |
| 112 #elif defined(OS_OPENBSD) | 114 #elif defined(OS_OPENBSD) |
| 113 return Client::CHROME_OPENBSD; | 115 return Client::CHROME_OPENBSD; |
| 114 #elif defined(OS_SOLARIS) | 116 #elif defined(OS_SOLARIS) |
| 115 return Client::CHROME_SOLARIS; | 117 return Client::CHROME_SOLARIS; |
| 116 #elif defined(OS_QNX) | 118 #elif defined(OS_QNX) |
| 117 return Client::CHROME_QNX; | 119 return Client::CHROME_QNX; |
| 118 #else | 120 #else |
| 119 return Client::UNKNOWN; | 121 return Client::UNKNOWN; |
| 120 #endif | 122 #endif |
| 121 } | 123 } |
| OLD | NEW |