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/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/sdch/sdch_owner.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)
+#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 base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kUseSimpleCacheBackend)) {
     const std::string opt_value =
@@ skipping 391 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)
+  set_data_reduction_proxy_ui_service(
+      scoped_ptr<data_reduction_proxy::DataReductionProxyUIService>
+          (new data_reduction_proxy::DataReductionProxyUIService(

[mmenke, 2015/01/16 20:15:27]

DataReductionProxyDebugUIService?  Should make it clear that it's only used for
debugging, as opposed to a general purpose UI for everyone.

[megjablon, 2015/01/17 02:21:48]

Done.

+              base::Bind(&data_reduction_proxy::DataReductionProxyConfigurator::
+                             GetProxyConfigOnIOThread,
+                         base::Unretained(data_reduction_proxy_configurator())),
+              BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
+              BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO))));
+#endif
 
   // TODO(vadimt): Remove ScopedTracker below once crbug.com/436671 is fixed.
   tracked_objects::ScopedTracker tracking_profile3(
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "436671 ProfileImplIOData::InitializeInternal3"));
 
   scoped_ptr<data_reduction_proxy::DataReductionProxyNetworkDelegate>
   data_reduction_proxy_network_delegate(
       new data_reduction_proxy::DataReductionProxyNetworkDelegate(
           chrome_network_delegate.Pass(),
@@ skipping 424 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() ||
          base::CommandLine::ForCurrentProcess()->HasSwitch(
              data_reduction_proxy::switches::kEnableDataReductionProxy);
 }