Add MaybeInterceptRedirect/Response to URLRequestInterceptor

net/url_request/url_request_job_manager.cc

Index: net/url_request/url_request_job_manager.cc
diff --git a/net/url_request/url_request_job_manager.cc b/net/url_request/url_request_job_manager.cc
index 0fe557b14418b54ee437845aa9b481973f9e3adb..b0243b861499b10c9f0ab34555a66fb82bd0f3eb 100644
--- a/net/url_request/url_request_job_manager.cc
+++ b/net/url_request/url_request_job_manager.cc
@@ -120,11 +120,17 @@ URLRequestJob* URLRequestJobManager::MaybeInterceptRedirect(
   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;
   }
@@ -147,10 +153,16 @@ URLRequestJob* URLRequestJobManager::MaybeInterceptResponse(
   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;
   }