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

android_webview/browser/net/aw_network_delegate.h

Index: android_webview/browser/net/aw_network_delegate.h
diff --git a/android_webview/browser/net/aw_network_delegate.h b/android_webview/browser/net/aw_network_delegate.h
index 4447bd1ca644c016c078e39a5b9a66a3c900e972..4dfdc3089356426e5bae6c0636245cf77a9b8ee2 100644
--- a/android_webview/browser/net/aw_network_delegate.h
+++ b/android_webview/browser/net/aw_network_delegate.h
@@ -6,12 +6,7 @@
 #define ANDROID_WEBVIEW_BROWSER_NET_AW_NETWORK_DELEGATE_H_
 
 #include "base/basictypes.h"
-#include "net/base/network_delegate.h"
-
-namespace data_reduction_proxy {
-class DataReductionProxyAuthRequestHandler;
-class DataReductionProxyParams;
-}
+#include "net/base/network_delegate_impl.h"
 
 namespace net {
 class ProxyInfo;
@@ -21,24 +16,11 @@ class URLRequest;
 namespace android_webview {
 
 // WebView's implementation of the NetworkDelegate.
-class AwNetworkDelegate : public net::NetworkDelegate {
+class AwNetworkDelegate : public net::NetworkDelegateImpl {
  public:
   AwNetworkDelegate();
   virtual ~AwNetworkDelegate();
 
-  // Sets the |DataReductionProxySettings| object to use. If not set, the
-  // NetworkDelegate will not perform any operations related to the data
-  // reduction proxy.
-  void set_data_reduction_proxy_params(
-      data_reduction_proxy::DataReductionProxyParams* params) {
-    data_reduction_proxy_params_ = params;
-  }
-
-  void set_data_reduction_proxy_auth_request_handler(
-      data_reduction_proxy::DataReductionProxyAuthRequestHandler* handler) {
-    data_reduction_proxy_auth_request_handler_ = handler;
-  }
-
  private:
   // NetworkDelegate implementation.
   virtual int OnBeforeURLRequest(net::URLRequest* request,
@@ -47,10 +29,6 @@ class AwNetworkDelegate : public net::NetworkDelegate {
   virtual int OnBeforeSendHeaders(net::URLRequest* request,
                                   const net::CompletionCallback& callback,
                                   net::HttpRequestHeaders* headers) override;
-  virtual void OnBeforeSendProxyHeaders(
-      net::URLRequest* request,
-      const net::ProxyInfo& proxy_info,
-      net::HttpRequestHeaders* headers) override;
   virtual void OnSendHeaders(net::URLRequest* request,
                              const net::HttpRequestHeaders& headers) override;
   virtual int OnHeadersReceived(
@@ -86,11 +64,6 @@ class AwNetworkDelegate : public net::NetworkDelegate {
       net::SocketStream* stream,
       const net::CompletionCallback& callback) override;
 
-  // Data reduction proxy parameters object. Must outlive this.
-  data_reduction_proxy::DataReductionProxyParams* data_reduction_proxy_params_;
-  data_reduction_proxy::DataReductionProxyAuthRequestHandler*
-  data_reduction_proxy_auth_request_handler_;
-
   DISALLOW_COPY_AND_ASSIGN(AwNetworkDelegate);
 };