Move data reduction proxy logic out of chrome and android webview network delegate

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 19 matching lines @@
 #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/core/browser/data_reduction_proxy_auth_request_handler.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_interceptor.h"
+#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate.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_params.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 357 matching lines @@
 ProfileImplIOData::LazyParams::~LazyParams() {}
 
 ProfileImplIOData::ProfileImplIOData()
     : ProfileIOData(Profile::REGULAR_PROFILE),
       http_server_properties_manager_(NULL),
       app_cache_max_size_(0),
       app_media_cache_max_size_(0) {
 }
 
 ProfileImplIOData::~ProfileImplIOData() {
-  if (initialized())
-    network_delegate()->set_domain_reliability_monitor(NULL);
+  if (initialized()) {
+    chrome_network_delegate()->set_domain_reliability_monitor(NULL);
+  }

[bengr, 2014/12/02 17:20:00]

Remove curly braces.

[megjablon, 2014/12/02 22:33:21]

Done.

 
   DestroyResourceContext();
 
   if (media_request_context_)
     media_request_context_->AssertNoURLRequests();
 }
 
 void ProfileImplIOData::InitializeInternal(
     ProfileParams* profile_params,
     content::ProtocolHandlerMap* protocol_handlers,
@@ skipping 11 matching lines @@
               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());
 
-  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(
-      data_reduction_proxy_statistics_prefs());
-  network_delegate()->set_on_resolve_proxy_handler(
-      base::Bind(data_reduction_proxy::OnResolveProxyHandler));
-  network_delegate()->set_proxy_config_getter(
+  network_delegate()->Init(

[bengr, 2014/12/02 17:20:00]

Try to tighten this up. I think these parameters should be put into three
groups:
1) parameters that could be passed in on network delegate construction, (2)
parameters that must be passed in later during an Init() call, and (3)
parameters that the network delegate should instantiate itself (and not be
passed in).

[megjablon, 2014/12/02 22:33:21]

I have moved everything to the constructor and gotten rid of the Init call. I
don't see anything that between AwURLRequestContextGetter, ProfileImplIOData,
and IOThread that I can instantiate in the constructor. Can you take a look at
this Ben to see if I'm missing something?

+      NULL, NULL,
+      &data_reduction_proxy_enabled_,
+      data_reduction_proxy_params(),
+      data_reduction_proxy_usage_stats(),
+      data_reduction_proxy_auth_request_handler(),
+      data_reduction_proxy_statistics_prefs(),
+      base::Bind(data_reduction_proxy::OnResolveProxyHandler),
       base::Bind(
           &DataReductionProxyChromeConfigurator::GetProxyConfigOnIOThread,
           base::Unretained(data_reduction_proxy_chrome_configurator())));
-  network_delegate()->set_predictor(predictor_.get());
+  chrome_network_delegate()->set_predictor(predictor_.get());
 
   // Initialize context members.
 
   ApplyProfileParamsToContext(main_context);
 
   if (http_server_properties_manager_)
     http_server_properties_manager_->InitializeOnNetworkThread();
 
   main_context->set_transport_security_state(transport_security_state());
 
@@ skipping 127 matching lines @@
   StoragePartitionDescriptor details(profile_path_, false);
   media_request_context_.reset(InitializeMediaRequestContext(main_context,
                                                              details));
 
   if (domain_reliability_monitor_) {
     domain_reliability::DomainReliabilityMonitor* monitor =
         domain_reliability_monitor_.get();
     monitor->InitURLRequestContext(main_context);
     monitor->AddBakedInConfigs();
     monitor->SetDiscardUploads(!GetMetricsEnabledStateOnIOThread());
-    network_delegate()->set_domain_reliability_monitor(monitor);
+    chrome_network_delegate()->set_domain_reliability_monitor(monitor);
   }
 
   lazy_params_.reset();
 }
 
 void ProfileImplIOData::
     InitializeExtensionsRequestContext(ProfileParams* profile_params) const {
   net::URLRequestContext* extensions_context = extensions_request_context();
   IOThread* const io_thread = profile_params->io_thread;
   IOThread::Globals* const io_thread_globals = io_thread->globals();
@@ skipping 226 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);
 }