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

Unified Diff: chrome/browser/profiles/profile_io_data.h

Issue 734263003: Move data reduction proxy logic out of chrome and android webview network delegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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 side-by-side diff with in-line comments
Download patch
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 9695bab88b6017152743a947482f05e226837755..09a600d704569d9f0d560e48851ce2d91efbef72 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 "content/public/browser/content_browser_client.h"
@@ -438,8 +439,13 @@ class ProfileIOData {
data_reduction_proxy_auth_request_handler.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 {
@@ -647,14 +653,16 @@ 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_;
mutable scoped_ptr<data_reduction_proxy::DataReductionProxyAuthRequestHandler>
data_reduction_proxy_auth_request_handler_;
- 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_;

Powered by Google App Engine
This is Rietveld 408576698