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 16 matching lines @@
 #include "chrome/browser/net/http_server_properties_manager_factory.h"
 #include "chrome/browser/net/predictor.h"
 #include "chrome/browser/net/quota_policy_channel_id_store.h"
 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator.h"
 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
+#include "components/data_reduction_proxy/content/data_reduction_proxy_ui_service.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_protocol.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_pref_names.h"
 #include "components/domain_reliability/monitor.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/cookie_store_factory.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/resource_context.h"
@@ skipping 85 matching lines @@
     content::CookieStoreConfig::SessionCookieMode session_cookie_mode,
     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) {
+        data_reduction_proxy_statistics_prefs,
+    scoped_ptr<data_reduction_proxy::DataReductionProxyUIService>

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

Hmm. This UI service won't be available on iOS. I'd hate to have to guard all
references to it with #if !defined(OS_IOS). Let's look around for a pattern that
other layered components use. E.g., a base class that's not in content.

+        data_reduction_proxy_ui_service) {
   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;
   lazy_params->cache_path = cache_path;
   lazy_params->cache_max_size = cache_max_size;
@@ skipping 19 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());
+  io_data_->set_data_reduction_proxy_ui_service(

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

Now would be a good time to write a DataReductionProxyIOData class that contains
all of this initialization logic.

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

Done.

+      data_reduction_proxy_ui_service.Pass());
 }
 
 content::ResourceContext*
     ProfileImplIOData::Handle::GetResourceContext() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   LazyInitialize();
   return GetResourceContextNoInit();
 }
 
 content::ResourceContext*
@@ skipping 240 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/10/31 17:06:47]

Can you do this if the ui_service() is not NULL instead?

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

Done.

+  data_reduction_proxy_ui_service()->set_proxy_config_getter(
+          base::Bind(
+              &DataReductionProxyChromeConfigurator::GetProxyConfigOnIO,
+              base::Unretained(data_reduction_proxy_chrome_configurator())));
+#endif
 
   network_delegate()->set_data_reduction_proxy_enabled_pref(
       &data_reduction_proxy_enabled_);
   network_delegate()->set_data_reduction_proxy_params(
       data_reduction_proxy_params());
   network_delegate()->set_data_reduction_proxy_usage_stats(
       data_reduction_proxy_usage_stats());
   network_delegate()->set_data_reduction_proxy_auth_request_handler(
       data_reduction_proxy_auth_request_handler());
   network_delegate()->set_data_reduction_proxy_statistics_prefs(
@@ skipping 378 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);
 }