Change Interceptors into URLRequestJobFactory::ProtocolHandlers.

chrome/browser/net/connect_interceptor.cc

 // 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.
 
 #include "chrome/browser/net/connect_interceptor.h"
 
 #include "chrome/browser/net/predictor.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_request.h"
 
 namespace chrome_browser_net {
 
 // We don't bother learning to preconnect via a GET if the original URL
 // navigation was so long ago, that a preconnection would have been dropped
 // anyway.  We believe most servers will drop the connection in 10 seconds, so
 // we currently estimate this time-till-drop at 10 seconds.
 // TODO(jar): We should do a persistent field trial to validate/optimize this.
 static const int kMaxUnusedSocketLifetimeSecondsWithoutAGet = 10;
 
 ConnectInterceptor::ConnectInterceptor(Predictor* predictor)
     : timed_cache_(base::TimeDelta::FromSeconds(
           kMaxUnusedSocketLifetimeSecondsWithoutAGet)),
       predictor_(predictor) {
   DCHECK(predictor);
 }
 
 ConnectInterceptor::~ConnectInterceptor() {
 }
 
-net::URLRequestJob* ConnectInterceptor::MaybeIntercept(
-    net::URLRequest* request, net::NetworkDelegate* network_delegate) const {
+void ConnectInterceptor::WitnessURLRequest(net::URLRequest* request) const {
   GURL request_scheme_host(Predictor::CanonicalizeUrl(request->url()));
   if (request_scheme_host == GURL::EmptyGURL())
-    return NULL;
+    return;
 
   // Learn what URLs are likely to be needed during next startup.
   predictor_->LearnAboutInitialNavigation(request_scheme_host);
 
   bool redirected_host = false;
   if (request->referrer().empty()) {
     if (request->url() != request->original_url()) {
       // This request was completed with a redirect.
       GURL original_scheme_host(request->original_url().GetWithEmptyPath());
       if (request_scheme_host != original_scheme_host) {
@@ skipping 22 matching lines @@
     // Learn about our referring URL, for use in the future.
     if (is_subresource && timed_cache_.WasRecentlySeen(referring_scheme_host))
       predictor_->LearnFromNavigation(referring_scheme_host,
                                       request_scheme_host);
     if (referring_scheme_host == request_scheme_host) {
       // We've already made any/all predictions when we navigated to the
       // referring host, so we can bail out here.
       // We don't update the RecentlySeen() time because any preconnections
       // need to be made at the first navigation (i.e., when referer was loaded)
       // and wouldn't have waited for this current request navigation.
-      return NULL;
+      return;
     }
   }
   timed_cache_.SetRecentlySeen(request_scheme_host);
 
   // Subresources for main frames usually get predicted when we detected the
   // main frame request - way back in RenderViewHost::Navigate.  So only handle
   // predictions now for subresources or for redirected hosts.
   if ((request->load_flags() & net::LOAD_SUB_FRAME) || redirected_host)
     predictor_->PredictFrameSubresources(request_scheme_host);
-  return NULL;
-}
-
-net::URLRequestJob* ConnectInterceptor::MaybeInterceptResponse(
-    net::URLRequest* request, net::NetworkDelegate* network_delegate) const {
-  return NULL;
-}
-
-net::URLRequestJob* ConnectInterceptor::MaybeInterceptRedirect(
-    const GURL& location,
-    net::URLRequest* request,
-    net::NetworkDelegate* network_delegate) const {
-  return NULL;
+  return;
 }
 
 ConnectInterceptor::TimedCache::TimedCache(const base::TimeDelta& max_duration)
     : mru_cache_(UrlMruTimedCache::NO_AUTO_EVICT),
       max_duration_(max_duration) {
 }
 
 // Make Clang compilation happy with explicit destructor.
 ConnectInterceptor::TimedCache::~TimedCache() {}
 
@@ skipping 10 matching lines @@
   }
   return mru_cache_.end() != mru_cache_.Peek(url);
 }
 
 void ConnectInterceptor::TimedCache::SetRecentlySeen(const GURL& url) const {
   DCHECK_EQ(url.GetWithEmptyPath(), url);
   mru_cache_.Put(url, base::TimeTicks::Now());
 }
 
 }  // namespace chrome_browser_net