Update from chromium https://crrev.com/304586

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 6fcff221616ffad4efffad9a457197c6d4d070c3..a1540fadc5ac7ac9aa9d052a75e5a3f30e13532a 100644
--- a/net/url_request/url_request_job_manager.cc
+++ b/net/url_request/url_request_job_manager.cc
@@ -68,18 +68,6 @@ URLRequestJob* URLRequestJobManager::CreateJob(
 
   // See if the request should be intercepted.
   //
-
-  // TODO(pauljensen): Remove this when AppCacheInterceptor is a
-  // ProtocolHandler, see crbug.com/161547.
-  if (!(request->load_flags() & LOAD_DISABLE_INTERCEPT)) {
-    InterceptorList::const_iterator i;
-    for (i = interceptors_.begin(); i != interceptors_.end(); ++i) {
-      URLRequestJob* job = (*i)->MaybeIntercept(request, network_delegate);
-      if (job)
-        return job;
-    }
-  }
-
   URLRequestJob* job = job_factory->MaybeCreateJobWithProtocolHandler(
       scheme, request, network_delegate);
   if (job)
@@ -108,7 +96,6 @@ URLRequestJob* URLRequestJobManager::MaybeInterceptRedirect(
     const GURL& location) const {
   DCHECK(IsAllowedThread());
   if (!request->url().is_valid() ||
-      request->load_flags() & LOAD_DISABLE_INTERCEPT ||
       request->status().status() == URLRequestStatus::CANCELED) {
     return NULL;
   }
@@ -120,15 +107,6 @@ URLRequestJob* URLRequestJobManager::MaybeInterceptRedirect(
   if (!job_factory->IsHandledProtocol(scheme))
     return NULL;
 
-  InterceptorList::const_iterator i;
-  for (i = interceptors_.begin(); i != interceptors_.end(); ++i) {
-    URLRequestJob* job = (*i)->MaybeInterceptRedirect(request,
-                                                      network_delegate,
-                                                      location);
-    if (job)
-      return job;
-  }
-
   URLRequestJob* job =
       request->context()->job_factory()->MaybeInterceptRedirect(
           request, network_delegate, location);
@@ -142,7 +120,6 @@ 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;
   }
@@ -154,14 +131,6 @@ URLRequestJob* URLRequestJobManager::MaybeInterceptResponse(
   if (!job_factory->IsHandledProtocol(scheme))
     return NULL;
 
-  InterceptorList::const_iterator i;
-  for (i = interceptors_.begin(); i != interceptors_.end(); ++i) {
-    URLRequestJob* job = (*i)->MaybeInterceptResponse(request,
-                                                      network_delegate);
-    if (job)
-      return job;
-  }
-
   URLRequestJob* job =
       request->context()->job_factory()->MaybeInterceptResponse(
           request, network_delegate);
@@ -181,29 +150,6 @@ bool URLRequestJobManager::SupportsScheme(const std::string& scheme) {
   return false;
 }
 
-void URLRequestJobManager::RegisterRequestInterceptor(
-    URLRequest::Interceptor* interceptor) {
-  DCHECK(IsAllowedThread());
-
-  base::AutoLock locked(lock_);
-
-  DCHECK(std::find(interceptors_.begin(), interceptors_.end(), interceptor) ==
-         interceptors_.end());
-  interceptors_.push_back(interceptor);
-}
-
-void URLRequestJobManager::UnregisterRequestInterceptor(
-    URLRequest::Interceptor* interceptor) {
-  DCHECK(IsAllowedThread());
-
-  base::AutoLock locked(lock_);
-
-  InterceptorList::iterator i =
-      std::find(interceptors_.begin(), interceptors_.end(), interceptor);
-  DCHECK(i != interceptors_.end());
-  interceptors_.erase(i);
-}
-
 URLRequestJobManager::URLRequestJobManager()
     : allowed_thread_(0),
       allowed_thread_initialized_(false) {