| Index: chrome/browser/profiles/profile_io_data.h
|
| diff --git a/chrome/browser/profiles/profile_io_data.h b/chrome/browser/profiles/profile_io_data.h
|
| index 48a59e7c2d8530de72eb9c71123a382a0241afe3..0d1a7dbe6e173b06133e5e219e182950f77ea845 100644
|
| --- a/chrome/browser/profiles/profile_io_data.h
|
| +++ b/chrome/browser/profiles/profile_io_data.h
|
| @@ -24,6 +24,7 @@
|
| #include "chrome/browser/profiles/storage_partition_descriptor.h"
|
| #include "components/content_settings/core/common/content_settings_types.h"
|
| #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_auth_request_handler.h"
|
| +#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate.h"
|
| #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_statistics_prefs.h"
|
| #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_usage_stats.h"
|
| #include "components/data_reduction_proxy/core/common/data_reduction_proxy_event_store.h"
|
| @@ -451,8 +452,13 @@ class ProfileIOData {
|
| data_reduction_proxy_event_store.Pass();
|
| }
|
|
|
| - ChromeNetworkDelegate* network_delegate() const {
|
| - return network_delegate_.get();
|
| + ChromeNetworkDelegate* chrome_network_delegate() const {
|
| + return chrome_network_delegate_;
|
| + }
|
| +
|
| + data_reduction_proxy::DataReductionProxyNetworkDelegate*
|
| + network_delegate() const {
|
| + return data_reduction_proxy_network_delegate_.get();
|
| }
|
|
|
| net::FraudulentCertificateReporter* fraudulent_certificate_reporter() const {
|
| @@ -660,7 +666,7 @@ class ProfileIOData {
|
| mutable scoped_ptr<data_reduction_proxy::DataReductionProxyUsageStats>
|
| data_reduction_proxy_usage_stats_;
|
| mutable scoped_ptr<data_reduction_proxy::DataReductionProxyStatisticsPrefs>
|
| - data_reduction_proxy_statistics_prefs_;
|
| + data_reduction_proxy_statistics_prefs_;
|
| mutable base::Callback<void(bool)> data_reduction_proxy_unavailable_callback_;
|
| mutable scoped_ptr<DataReductionProxyChromeConfigurator>
|
| data_reduction_proxy_chrome_configurator_;
|
| @@ -669,7 +675,9 @@ class ProfileIOData {
|
| mutable scoped_ptr<data_reduction_proxy::DataReductionProxyEventStore>
|
| data_reduction_proxy_event_store_;
|
|
|
| - mutable scoped_ptr<ChromeNetworkDelegate> network_delegate_;
|
| + mutable ChromeNetworkDelegate* chrome_network_delegate_;
|
| + mutable scoped_ptr<data_reduction_proxy::DataReductionProxyNetworkDelegate>
|
| + data_reduction_proxy_network_delegate_;
|
| mutable scoped_ptr<net::FraudulentCertificateReporter>
|
| fraudulent_certificate_reporter_;
|
| mutable scoped_ptr<net::ProxyService> proxy_service_;
|
|
|