Change Interceptors into URLRequestJobFactory::ProtocolHandlers.

chrome/browser/net/connect_interceptor.h

 // Copyright (c) 2011 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_NET_CONNECT_INTERCEPTOR_H_
 #define CHROME_BROWSER_NET_CONNECT_INTERCEPTOR_H_
 
 #include "base/containers/mru_cache.h"
 #include "base/gtest_prod_util.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "net/url_request/url_request_job_factory.h"
 
 namespace chrome_browser_net {
 
 class Predictor;
 
 //------------------------------------------------------------------------------
 // An interceptor to monitor URLRequests so that we can do speculative DNS
 // resolution and/or speculative TCP preconnections.
-class ConnectInterceptor : public net::URLRequestJobFactory::Interceptor {
+class ConnectInterceptor : public net::URLRequestJobFactory::ProtocolHandler {
  public:
-  // Construction includes registration as an URL.
-  explicit ConnectInterceptor(Predictor* predictor);
+  // Creation includes registration as an URL.
+  static scoped_ptr<net::URLRequestJobFactory> CreateURLRequestJobFactory(
+      scoped_ptr<net::URLRequestJobFactory> base_job_factory,
+      Predictor* predictor);
   // Destruction includes unregistering.
   virtual ~ConnectInterceptor();
 
  protected:
-  // Overridden from net::URLRequest::Interceptor:
+  // Overridden from net::URLRequestJobFactory::ProtocolHandler:
   // Learn about referrers, and optionally preconnect based on history.
-  virtual net::URLRequestJob* MaybeIntercept(
-      net::URLRequest* request,
-      net::NetworkDelegate* network_delegate) const OVERRIDE;
-  virtual net::URLRequestJob* MaybeInterceptResponse(
-      net::URLRequest* request,
-      net::NetworkDelegate* network_delegate) const OVERRIDE;
-  virtual net::URLRequestJob* MaybeInterceptRedirect(
-      const GURL& location,
+  virtual net::URLRequestJob* MaybeCreateJob(
       net::URLRequest* request,
       net::NetworkDelegate* network_delegate) const OVERRIDE;
 
  private:
+  explicit ConnectInterceptor(Predictor* predictor);
+
   // Provide access to local class TimedCache for testing.
   FRIEND_TEST_ALL_PREFIXES(ConnectInterceptorTest, TimedCacheRecall);
   FRIEND_TEST_ALL_PREFIXES(ConnectInterceptorTest, TimedCacheEviction);
 
   // Define a LRU cache that recalls all navigations within the last N seconds.
   // When we learn about subresources to possibly preconnect to, it would be a
   // waste to preconnect when the original navigation was too long ago.  Any
   // connected, but unused TCP/IP connection, will generally be reset by the
   // server if it is not used quickly (i.e., GET or POST is sent).
   class TimedCache {
@@ skipping 25 matching lines @@
   };
   TimedCache timed_cache_;
   Predictor* const predictor_;
 
   DISALLOW_COPY_AND_ASSIGN(ConnectInterceptor);
 };
 
 }  // namespace chrome_browser_net
 
 #endif  // CHROME_BROWSER_NET_CONNECT_INTERCEPTOR_H_