Remove unused pieces of URLRequestJobFactory API.

This is mostly the Interceptor logic which is now unused.
Also switch DebugDevToolsInterceptor (the last remaining
Interceptor) to a ProtocolHandler.

BUG=146602,161529

Review URL: https://chromiumcodereview.appspot.com/12217095

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182016 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 9 insertions, 38 deletions

diff --git a/android_webview/browser/net/aw_url_request_job_factory.cc b/android_webview/browser/net/aw_url_request_job_factory.cc
index ad3dbdb..c14cd17 100644
--- a/android_webview/browser/net/aw_url_request_job_factory.cc
+++ b/android_webview/browser/net/aw_url_request_job_factory.cc
@@ -63,28 +63,4 @@ bool AwURLRequestJobFactory::SetProtocolHandler(
   return next_factory_->SetProtocolHandler(scheme, protocol_handler);
 }
 
-void AwURLRequestJobFactory::AddInterceptor(Interceptor* interceptor) {
-  next_factory_->AddInterceptor(interceptor);
-}
-
-URLRequestJob* AwURLRequestJobFactory::MaybeCreateJobWithInterceptor(
-    URLRequest* request, NetworkDelegate* network_delegate) const {
-  return next_factory_->MaybeCreateJobWithInterceptor(
-      request, network_delegate);
-}
-
-URLRequestJob* AwURLRequestJobFactory::MaybeInterceptRedirect(
-    const GURL& location,
-    URLRequest* request,
-    NetworkDelegate* network_delegate) const {
-  return next_factory_->MaybeInterceptRedirect(
-      location, request, network_delegate);
-}
-
-URLRequestJob* AwURLRequestJobFactory::MaybeInterceptResponse(
-    URLRequest* request,
-    NetworkDelegate* network_delegate) const {
-  return next_factory_->MaybeInterceptResponse(request, network_delegate);
-}
-
 } // namespace android_webview
diff --git a/android_webview/browser/net/aw_url_request_job_factory.h b/android_webview/browser/net/aw_url_request_job_factory.h
index 3201fbd..8978df5 100644
--- a/android_webview/browser/net/aw_url_request_job_factory.h
+++ b/android_webview/browser/net/aw_url_request_job_factory.h
@@ -8,6 +8,10 @@
 #include "base/memory/scoped_ptr.h"
 #include "net/url_request/url_request_job_factory.h"
 
+namespace net {
+class URLRequestJobFactoryImpl;
+}  // namespace net
+
 namespace android_webview {
 
 // android_webview uses a custom URLRequestJobFactoryImpl to support
@@ -21,30 +25,21 @@ class AwURLRequestJobFactory : public net::URLRequestJobFactory {
   AwURLRequestJobFactory();
   virtual ~AwURLRequestJobFactory();
 
-  virtual bool SetProtocolHandler(const std::string& scheme,
-                          ProtocolHandler* protocol_handler) OVERRIDE;
-  virtual void AddInterceptor(Interceptor* interceptor) OVERRIDE;
-  virtual net::URLRequestJob* MaybeCreateJobWithInterceptor(
-      net::URLRequest* request,
-      net::NetworkDelegate* network_delegate) const OVERRIDE;
+  bool SetProtocolHandler(const std::string& scheme,
+                          ProtocolHandler* protocol_handler);
+
+  // net::URLRequestJobFactory implementation.
   virtual net::URLRequestJob* MaybeCreateJobWithProtocolHandler(
       const std::string& scheme,
       net::URLRequest* request,
       net::NetworkDelegate* network_delegate) const OVERRIDE;
-  virtual net::URLRequestJob* MaybeInterceptRedirect(
-      const GURL& location,
-      net::URLRequest* request,
-      net::NetworkDelegate* network_delegate) const OVERRIDE;
-  virtual net::URLRequestJob* MaybeInterceptResponse(
-      net::URLRequest* request,
-      net::NetworkDelegate* network_delegate) const OVERRIDE;
   virtual bool IsHandledProtocol(const std::string& scheme) const OVERRIDE;
   virtual bool IsHandledURL(const GURL& url) const OVERRIDE;
 
  private:
   // By default calls are forwarded to this factory, to avoid having to
   // subclass an existing implementation class.
-  scoped_ptr<URLRequestJobFactory> next_factory_;
+  scoped_ptr<net::URLRequestJobFactoryImpl> next_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AwURLRequestJobFactory);
 };