Data Reduction Proxy Interstitials

chrome/browser/profiles/profile_impl.cc

Index: chrome/browser/profiles/profile_impl.cc
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index 7425274d2ffaede7a730eb29a15a26a4793be01d..fa374307aa14bc7b3012d7dd564fa646e1b216e3 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -108,6 +108,7 @@
 #if defined(OS_ANDROID)
 #include "chrome/browser/media/protected_media_identifier_permission_context.h"
 #include "chrome/browser/media/protected_media_identifier_permission_context_factory.h"
+#include "components/data_reduction_proxy/content/data_reduction_proxy_ui_service.h"
 #endif
 
 #if defined(OS_CHROMEOS)
@@ -640,6 +641,12 @@ void ProfileImpl::DoFinalInit() {
   scoped_ptr<DataReductionProxyChromeConfigurator> chrome_configurator;
   scoped_ptr<data_reduction_proxy::DataReductionProxyStatisticsPrefs>
       data_reduction_proxy_statistics_prefs;
+#if defined(OS_ANDROID)
+  scoped_ptr<data_reduction_proxy::DataReductionProxyUIService>

[bengr, 2014/10/31 17:06:47]

Move the scoped_ptr outside the "#if defined" block, and then remove the
platform check at line 704.

[megjablon, 2014/12/11 23:32:03]

Acknowledged.

+      data_reduction_proxy_ui_service =
+          scoped_ptr<data_reduction_proxy::DataReductionProxyUIService>(
+              new data_reduction_proxy::DataReductionProxyUIService());
+#endif
   DataReductionProxyChromeSettings* data_reduction_proxy_chrome_settings =
       DataReductionProxyChromeSettingsFactory::GetForBrowserContext(this);
   data_reduction_proxy_params =
@@ -693,7 +700,13 @@ void ProfileImpl::DoFinalInit() {
                 data_reduction_proxy_unavailable,
                 chrome_configurator.Pass(),
                 data_reduction_proxy_params.Pass(),
-                data_reduction_proxy_statistics_prefs.Pass());
+                data_reduction_proxy_statistics_prefs.Pass(),
+#if defined(OS_ANDROID)
+                data_reduction_proxy_ui_service.Pass());
+#else
+                NULL);
+#endif
+
   data_reduction_proxy_chrome_settings->InitDataReductionProxySettings(
       data_reduction_proxy_chrome_configurator,
       prefs_.get(),