Data Reduction Proxy Interstitials

chrome/browser/profiles/profile_impl_io_data.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/profiles/profile_impl_io_data.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
@@ skipping 43 matching lines @@
 #include "net/base/cache_type.h"
 #include "net/base/sdch_manager.h"
 #include "net/ftp/ftp_network_layer.h"
 #include "net/http/http_cache.h"
 #include "net/http/http_server_properties_manager.h"
 #include "net/ssl/channel_id_service.h"
 #include "net/url_request/url_request_intercepting_job_factory.h"
 #include "net/url_request/url_request_job_factory_impl.h"
 #include "storage/browser/quota/special_storage_policy.h"
 
+#if defined(OS_ANDROID)

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

Include unconditionally.

[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
+
 namespace {
 
 net::BackendType ChooseCacheBackendType() {
 #if defined(OS_ANDROID)
   return net::CACHE_BACKEND_SIMPLE;
 #else
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kUseSimpleCacheBackend)) {
     const std::string opt_value =
         command_line.GetSwitchValueASCII(switches::kUseSimpleCacheBackend);
@@ skipping 63 matching lines @@
     storage::SpecialStoragePolicy* special_storage_policy,
     scoped_ptr<domain_reliability::DomainReliabilityMonitor>
         domain_reliability_monitor,
     const base::Callback<void(bool)>& data_reduction_proxy_unavailable,
     scoped_ptr<DataReductionProxyChromeConfigurator>
         data_reduction_proxy_chrome_configurator,
     scoped_ptr<data_reduction_proxy::DataReductionProxyParams>
         data_reduction_proxy_params,
     scoped_ptr<data_reduction_proxy::DataReductionProxyStatisticsPrefs>
         data_reduction_proxy_statistics_prefs,
+#if defined(OS_ANDROID)

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

Remove #if defined

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

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

+    scoped_ptr<data_reduction_proxy::DataReductionProxyUIService>
+        data_reduction_proxy_ui_service,
+#endif
     scoped_ptr<data_reduction_proxy::DataReductionProxyEventStore>
         data_reduction_proxy_event_store) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!io_data_->lazy_params_);
   DCHECK(predictor);
 
   LazyParams* lazy_params = new LazyParams();
 
   lazy_params->cookie_path = cookie_path;
   lazy_params->channel_id_path = channel_id_path;
@@ skipping 21 matching lines @@
   if (io_data_->domain_reliability_monitor_)
     io_data_->domain_reliability_monitor_->MoveToNetworkThread();
 
   io_data_->set_data_reduction_proxy_unavailable_callback(
       data_reduction_proxy_unavailable);
   io_data_->set_data_reduction_proxy_chrome_configurator(
       data_reduction_proxy_chrome_configurator.Pass());
   io_data_->set_data_reduction_proxy_params(data_reduction_proxy_params.Pass());
   io_data_->set_data_reduction_proxy_statistics_prefs(
       data_reduction_proxy_statistics_prefs.Pass());
+#if defined(OS_ANDROID)

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

Remove #if defined

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

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

+  io_data_->set_data_reduction_proxy_ui_service(
+      data_reduction_proxy_ui_service.Pass());
+#endif
   io_data_->set_data_reduction_proxy_event_store(
       data_reduction_proxy_event_store.Pass());
 }
 
 content::ResourceContext*
     ProfileImplIOData::Handle::GetResourceContext() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   LazyInitialize();
   return GetResourceContextNoInit();
 }
@@ skipping 251 matching lines @@
               data_reduction_proxy_params(),
               BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO))));
   set_data_reduction_proxy_usage_stats(
       scoped_ptr<data_reduction_proxy::DataReductionProxyUsageStats>
           (new data_reduction_proxy::DataReductionProxyUsageStats(
               data_reduction_proxy_params(),
               BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI)
                   .get())));
   data_reduction_proxy_usage_stats()->set_unavailable_callback(
       data_reduction_proxy_unavailable_callback());
+#if defined(OS_ANDROID)

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

Remove #if defined

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

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

+  if (data_reduction_proxy_ui_service()) {
+    data_reduction_proxy_ui_service()->set_proxy_config_getter(
+        base::Bind(
+            &DataReductionProxyChromeConfigurator::GetProxyConfigOnIOThread,
+            base::Unretained(data_reduction_proxy_chrome_configurator())));
+  }
+#endif
 
   scoped_ptr<data_reduction_proxy::DataReductionProxyNetworkDelegate>
   data_reduction_proxy_network_delegate(
       new data_reduction_proxy::DataReductionProxyNetworkDelegate(
           chrome_network_delegate.Pass(),
           data_reduction_proxy_params(),
           data_reduction_proxy_auth_request_handler(),
           base::Bind(
               &DataReductionProxyChromeConfigurator::GetProxyConfigOnIOThread,
               base::Unretained(data_reduction_proxy_chrome_configurator()))));
@@ skipping 383 matching lines @@
   transport_security_state()->DeleteAllDynamicDataSince(time);
   DCHECK(http_server_properties_manager_);
   http_server_properties_manager_->Clear(completion);
 }
 
 bool ProfileImplIOData::IsDataReductionProxyEnabled() const {
   return data_reduction_proxy_enabled_.GetValue() ||
          CommandLine::ForCurrentProcess()->HasSwitch(
             data_reduction_proxy::switches::kEnableDataReductionProxy);
 }