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

chrome/browser/profiles/profile_io_data.h

 // 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.
 
 #ifndef CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
 #define CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/prefs/pref_member.h"
 #include "base/synchronization/lock.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/storage_partition_descriptor.h"
 #include "components/content_settings/core/common/content_settings_types.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_network_delegate.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_event_store.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/resource_context.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/http/http_cache.h"
 #include "net/http/http_network_session.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_job_factory.h"
@@ skipping 407 matching lines @@
     return data_reduction_proxy_event_store_.get();
   }
 
   void set_data_reduction_proxy_event_store(
       scoped_ptr<data_reduction_proxy::DataReductionProxyEventStore>
           data_reduction_proxy_event_store) const {
     data_reduction_proxy_event_store_ =
         data_reduction_proxy_event_store.Pass();
   }
 
-  ChromeNetworkDelegate* network_delegate() const {
-    return network_delegate_.get();
+  ChromeNetworkDelegate* chrome_network_delegate() const {
+      return chrome_network_delegate_;
+  }
+
+  data_reduction_proxy::DataReductionProxyNetworkDelegate*
+      network_delegate() const {
+    return data_reduction_proxy_network_delegate_.get();
   }
 
   net::FraudulentCertificateReporter* fraudulent_certificate_reporter() const {
     return fraudulent_certificate_reporter_.get();
   }
 
   net::ProxyService* proxy_service() const {
     return proxy_service_.get();
   }
 
@@ skipping 187 matching lines @@
 
   // data_reduction_proxy_* classes must be declared before |network_delegate_|.
   // The data_reduction_proxy_* classes are passed in to |network_delegate_|,
   // so this ordering ensures that the |network_delegate_| never references
   // freed objects.
   mutable scoped_ptr<data_reduction_proxy::DataReductionProxyParams>
       data_reduction_proxy_params_;
   mutable scoped_ptr<data_reduction_proxy::DataReductionProxyUsageStats>
       data_reduction_proxy_usage_stats_;
   mutable scoped_ptr<data_reduction_proxy::DataReductionProxyStatisticsPrefs>
-            data_reduction_proxy_statistics_prefs_;
+      data_reduction_proxy_statistics_prefs_;
   mutable base::Callback<void(bool)> data_reduction_proxy_unavailable_callback_;
   mutable scoped_ptr<DataReductionProxyChromeConfigurator>
       data_reduction_proxy_chrome_configurator_;
   mutable scoped_ptr<data_reduction_proxy::DataReductionProxyAuthRequestHandler>
       data_reduction_proxy_auth_request_handler_;
   mutable scoped_ptr<data_reduction_proxy::DataReductionProxyEventStore>
       data_reduction_proxy_event_store_;
 
-  mutable scoped_ptr<ChromeNetworkDelegate> network_delegate_;
+  mutable ChromeNetworkDelegate* chrome_network_delegate_;

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

Is this just a convenience? Can't you get this from
data_reduction_proxy_network_delegate_->network_delegate() or some such?

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

This doesn't work because we need the ChromeNetworkDelegate for some setters
which DataReductionProxyNetworkDelegate does not have.

+  mutable scoped_ptr<data_reduction_proxy::DataReductionProxyNetworkDelegate>
+      data_reduction_proxy_network_delegate_;
   mutable scoped_ptr<net::FraudulentCertificateReporter>
       fraudulent_certificate_reporter_;
   mutable scoped_ptr<net::ProxyService> proxy_service_;
   mutable scoped_ptr<net::TransportSecurityState> transport_security_state_;
   mutable scoped_ptr<net::HttpServerProperties>
       http_server_properties_;
 #if defined(OS_CHROMEOS)
   // Set to |cert_verifier_| if it references a PolicyCertVerifier. In that
   // case, the verifier is owned by  |cert_verifier_|. Otherwise, set to NULL.
   mutable policy::PolicyCertVerifier* policy_cert_verifier_;
@@ skipping 34 matching lines @@
 
   // TODO(jhawkins): Remove once crbug.com/102004 is fixed.
   bool initialized_on_UI_thread_;
 
   const Profile::ProfileType profile_type_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
 };
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_