Data Reduction Proxy Interstitials

chrome/browser/profiles/profile_io_data.h

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 244107f4e39bf987b1b1366e9a241e45170bb2dc..04fe8cc62a851438b22e975f8fb328cd685b59db 100644
--- a/chrome/browser/profiles/profile_io_data.h
+++ b/chrome/browser/profiles/profile_io_data.h
@@ -35,6 +35,10 @@
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_job_factory.h"
 
+#if defined(OS_ANDROID)

[bengr, 2014/12/17 00:30:19]

Remove the #if defined

[megjablon, 2014/12/23 02:18:03]

We decided not to have a base class as discussed offline.

+#include "components/data_reduction_proxy/content/browser/data_reduction_proxy_ui_service.h"
+#endif
+
 class ChromeHttpUserAgentSettings;
 class ChromeNetworkDelegate;
 class ChromeURLRequestContextGetter;
@@ -210,6 +214,18 @@ class ProfileIOData {
     return transport_security_state_.get();
   }
 
+  data_reduction_proxy::DataReductionProxyParams* data_reduction_proxy_params()
+      const {
+    return data_reduction_proxy_params_.get();
+  }
+
+#if defined(OS_ANDROID)

[bengr, 2014/12/17 00:30:19]

Remove the #if defined

[megjablon, 2014/12/23 02:18:03]

We decided not to have a base class as discussed offline.

+  data_reduction_proxy::DataReductionProxyUIService*
+  data_reduction_proxy_ui_service() const {
+    return data_reduction_proxy_ui_service_.get();
+  }
+#endif
+
 #if defined(OS_CHROMEOS)
   std::string username_hash() const {
     return username_hash_;
@@ -371,11 +387,6 @@ class ProfileIOData {
   void set_channel_id_service(
       net::ChannelIDService* channel_id_service) const;
 
-  data_reduction_proxy::DataReductionProxyParams* data_reduction_proxy_params()
-      const {
-    return data_reduction_proxy_params_.get();
-  }
-
   void set_data_reduction_proxy_params(
       scoped_ptr<data_reduction_proxy::DataReductionProxyParams>
           data_reduction_proxy_params) const {
@@ -444,6 +455,15 @@ class ProfileIOData {
     return data_reduction_proxy_event_store_.get();
   }
 
+#if defined(OS_ANDROID)

[bengr, 2014/12/17 00:30:19]

Remove the #if defined

[megjablon, 2014/12/23 02:18:03]

We decided not to have a base class as discussed offline.

+  void set_data_reduction_proxy_ui_service(
+      scoped_ptr<data_reduction_proxy::DataReductionProxyUIService>
+          data_reduction_proxy_ui_service) const {
+    data_reduction_proxy_ui_service_ =
+        data_reduction_proxy_ui_service.Pass();
+  }
+#endif
+
   void set_data_reduction_proxy_event_store(
       scoped_ptr<data_reduction_proxy::DataReductionProxyEventStore>
           data_reduction_proxy_event_store) const {
@@ -667,6 +687,10 @@ class ProfileIOData {
       data_reduction_proxy_auth_request_handler_;
   mutable scoped_ptr<data_reduction_proxy::DataReductionProxyEventStore>
       data_reduction_proxy_event_store_;
+#if defined(OS_ANDROID)

[bengr, 2014/12/17 00:30:19]

Remove the #if defined. Also add a comment that this must be declared after the
DataReductionProxyChromeConfigurator, because the configurator must be valid for
its entire lifetime.

[megjablon, 2014/12/23 02:18:03]

Done.

+  mutable scoped_ptr<data_reduction_proxy::DataReductionProxyUIService>
+      data_reduction_proxy_ui_service_;
+#endif
 
   mutable scoped_ptr<net::FraudulentCertificateReporter>
       fraudulent_certificate_reporter_;