| 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 14f9f5d8884c385e20bfa6af504b36d7d5d8ed12..283ee0d8f6f7ccb7d0e5dfa36cce7ebd2e4a324c 100644
|
| --- a/net/url_request/url_request_job_manager.cc
|
| +++ b/net/url_request/url_request_job_manager.cc
|
| @@ -79,14 +79,8 @@ URLRequestJob* URLRequestJobManager::CreateJob(
|
| // See if the request should be intercepted.
|
| //
|
|
|
| - if (job_factory) {
|
| - URLRequestJob* job = job_factory->MaybeCreateJobWithInterceptor(
|
| - request, network_delegate);
|
| - if (job)
|
| - return job;
|
| - }
|
| -
|
| - // TODO(willchan): Remove this in favor of URLRequestJobFactory::Interceptor.
|
| + // 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) {
|
| @@ -155,16 +149,11 @@ URLRequestJob* URLRequestJobManager::MaybeInterceptRedirect(
|
| return NULL;
|
| }
|
|
|
| - URLRequestJob* job = NULL;
|
| - if (job_factory)
|
| - job = job_factory->MaybeInterceptRedirect(
|
| - location, request, network_delegate);
|
| - if (job)
|
| - return job;
|
| -
|
| InterceptorList::const_iterator i;
|
| for (i = interceptors_.begin(); i != interceptors_.end(); ++i) {
|
| - job = (*i)->MaybeInterceptRedirect(request, network_delegate, location);
|
| + URLRequestJob* job = (*i)->MaybeInterceptRedirect(request,
|
| + network_delegate,
|
| + location);
|
| if (job)
|
| return job;
|
| }
|
| @@ -192,15 +181,10 @@ URLRequestJob* URLRequestJobManager::MaybeInterceptResponse(
|
| return NULL;
|
| }
|
|
|
| - URLRequestJob* job = NULL;
|
| - if (job_factory)
|
| - job = job_factory->MaybeInterceptResponse(request, network_delegate);
|
| - if (job)
|
| - return job;
|
| -
|
| InterceptorList::const_iterator i;
|
| for (i = interceptors_.begin(); i != interceptors_.end(); ++i) {
|
| - job = (*i)->MaybeInterceptResponse(request, network_delegate);
|
| + URLRequestJob* job = (*i)->MaybeInterceptResponse(request,
|
| + network_delegate);
|
| if (job)
|
| return job;
|
| }
|
|
|