Add MaybeInterceptRedirect/Response to URLRequestInterceptor

net/url_request/url_request_job_manager.cc

 // 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.
 
 #include "net/url_request/url_request_job_manager.h"
 
 #include <algorithm>
 
 #include "base/memory/singleton.h"
 #include "build/build_config.h"
@@ skipping 102 matching lines @@
     return NULL;
   }
 
   const URLRequestJobFactory* job_factory = NULL;
   job_factory = request->context()->job_factory();
 
   const std::string& scheme = request->url().scheme();  // already lowercase
   if (!job_factory->IsHandledProtocol(scheme))
     return NULL;
 
+  URLRequestJob* job =
+      request->context()->job_factory()->MaybeInterceptRedirect(
+          request, network_delegate, location);
+  if (job)
+    return job;
+
   InterceptorList::const_iterator i;
   for (i = interceptors_.begin(); i != interceptors_.end(); ++i) {
-    URLRequestJob* job = (*i)->MaybeInterceptRedirect(request,
-                                                      network_delegate,
-                                                      location);
+    job = (*i)->MaybeInterceptRedirect(request,
+                                       network_delegate,
+                                       location);
     if (job)
       return job;
   }
   return NULL;
 }
 
 URLRequestJob* URLRequestJobManager::MaybeInterceptResponse(
     URLRequest* request, NetworkDelegate* network_delegate) const {
   DCHECK(IsAllowedThread());
   if (!request->url().is_valid() ||
       request->load_flags() & LOAD_DISABLE_INTERCEPT ||
       request->status().status() == URLRequestStatus::CANCELED) {
     return NULL;
   }
 
   const URLRequestJobFactory* job_factory = NULL;
   job_factory = request->context()->job_factory();
 
   const std::string& scheme = request->url().scheme();  // already lowercase
   if (!job_factory->IsHandledProtocol(scheme))
     return NULL;
 
+  URLRequestJob* job =
+      request->context()->job_factory()->MaybeInterceptResponse(
+          request, network_delegate);

[michaeln, 2014/11/06 21:07:46]

Are you intentionally reversing the order the old vs new interceptors classes
are invoked?

From an earlier comment...
As coded the newly added MaybeInterceptResponse MaybeInterceptRedirect are doing
things in the opposite order where the new gets called prior to the old.

Unless you are doing that knowingly and for a good reason, I think maintaining
the same relative order for all of the MaybeIntercept* methods would make more
sense.

[bengr, 2014/11/06 23:58:01]

Done.

+  if (job)
+    return job;
+
   InterceptorList::const_iterator i;
   for (i = interceptors_.begin(); i != interceptors_.end(); ++i) {
-    URLRequestJob* job = (*i)->MaybeInterceptResponse(request,
-                                                      network_delegate);
+    job = (*i)->MaybeInterceptResponse(request,
+                                       network_delegate);
     if (job)
       return job;
   }
   return NULL;
 }
 
 // static
 bool URLRequestJobManager::SupportsScheme(const std::string& scheme) {
   for (size_t i = 0; i < arraysize(kBuiltinFactories); ++i) {
     if (LowerCaseEqualsASCII(scheme, kBuiltinFactories[i].scheme))
@@ skipping 27 matching lines @@
 }
 
 URLRequestJobManager::URLRequestJobManager()
     : allowed_thread_(0),
       allowed_thread_initialized_(false) {
 }
 
 URLRequestJobManager::~URLRequestJobManager() {}
 
 }  // namespace net