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

chrome/browser/profiles/profile_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_io_data.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 37 matching lines @@
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/signin/signin_names_io_thread.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "components/content_settings/core/browser/content_settings_provider.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_config_service.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_configurator.h"
+#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.h"
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_switches.h"
 #include "components/dom_distiller/core/url_constants.h"
 #include "components/startup_metric_utils/startup_metric_utils.h"
 #include "components/sync_driver/pref_names.h"
 #include "components/url_fixer/url_fixer.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/host_zoom_map.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/resource_context.h"
@@ skipping 931 matching lines @@
   CHECK(profile_params_.get());
 
   IOThread* const io_thread = profile_params_->io_thread;
   IOThread::Globals* const io_thread_globals = io_thread->globals();
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
 
   // Create the common request contexts.
   main_request_context_.reset(new net::URLRequestContext());
   extensions_request_context_.reset(new net::URLRequestContext());
 
-  ChromeNetworkDelegate* network_delegate =
-      new ChromeNetworkDelegate(
+  scoped_ptr<ChromeNetworkDelegate> network_delegate =
+      scoped_ptr<ChromeNetworkDelegate>(new ChromeNetworkDelegate(
 #if defined(ENABLE_EXTENSIONS)
           io_thread_globals->extension_event_router_forwarder.get(),
 #else
           NULL,
 #endif
-          &enable_referrers_);
+          &enable_referrers_));
   if (command_line.HasSwitch(switches::kEnableClientHints))
     network_delegate->SetEnableClientHints();
 #if defined(ENABLE_EXTENSIONS)
   network_delegate->set_extension_info_map(
       profile_params_->extension_info_map.get());
 #endif
 #if defined(ENABLE_CONFIGURATION_POLICY)
   network_delegate->set_url_blacklist_manager(url_blacklist_manager_.get());
 #endif
   network_delegate->set_profile(profile_params_->profile);
   network_delegate->set_profile_path(profile_params_->path);
   network_delegate->set_cookie_settings(profile_params_->cookie_settings.get());
   network_delegate->set_enable_do_not_track(&enable_do_not_track_);
   network_delegate->set_force_google_safe_search(&force_safesearch_);
   network_delegate->set_prerender_tracker(profile_params_->prerender_tracker);
-  network_delegate_.reset(network_delegate);
+  chrome_network_delegate_ = network_delegate.get();
+  Profile* profile =  reinterpret_cast<Profile*>(profile_params_->profile);
+    // Ignore off-the-record data.
+  PrefService* profile_prefs = NULL;
+  scoped_refptr<base::MessageLoopProxy> ui_thread_proxy;
+  if (profile && !profile->IsOffTheRecord()) {

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

When would provide be NULL?

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

Removed in moved code

+     profile_prefs = profile->GetPrefs();
+     ui_thread_proxy =
+         BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI);
+   }
+  data_reduction_proxy::DataReductionProxyNetworkDelegate*
+      data_reduction_proxy_network_delegate =
+          new data_reduction_proxy::DataReductionProxyNetworkDelegate(
+              network_delegate.Pass());
+  data_reduction_proxy_network_delegate->Init(

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

Again, this Init needs to be rewritten.

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

Removed.

+      profile_prefs, ui_thread_proxy, NULL, NULL, NULL, NULL, NULL,

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

This confuses me. You always instantiate the DRPNetworkDelegate, even on
incognito, but you don't pass in prefs or the message loop proxy if incognito?
Why is that?

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

Moved into ProfileImplIOData as discussed.

+      data_reduction_proxy::DataReductionProxyNetworkDelegate::
+          OnResolveProxyHandler(),
+      data_reduction_proxy::DataReductionProxyNetworkDelegate::
+          ProxyConfigGetter());
+  data_reduction_proxy_network_delegate_.reset(
+      data_reduction_proxy_network_delegate);
 
   fraudulent_certificate_reporter_.reset(
       new chrome_browser_net::ChromeFraudulentCertificateReporter(
           main_request_context_.get()));
 
   // NOTE: Proxy service uses the default io thread network delegate, not the
   // delegate just created.
   proxy_service_.reset(
       ProxyServiceFactory::CreateProxyService(
           io_thread->net_log(),
@@ skipping 245 matching lines @@
 void ProfileIOData::SetCookieSettingsForTesting(
     CookieSettings* cookie_settings) {
   DCHECK(!cookie_settings_.get());
   cookie_settings_ = cookie_settings;
 }
 
 void ProfileIOData::set_signin_names_for_testing(
     SigninNamesOnIOThread* signin_names) {
   signin_names_.reset(signin_names);
 }