Change Interceptors into URLRequestJobFactory::ProtocolHandlers.

android_webview/browser/net/aw_url_request_context_getter.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 "android_webview/browser/net/aw_url_request_context_getter.h"
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_request_interceptor.h"
 #include "android_webview/browser/net/aw_network_delegate.h"
 #include "android_webview/browser/net/aw_url_request_job_factory.h"
@@ skipping 91 matching lines @@
   url_request_context_.reset(builder.Build());
 
   job_factory_.reset(new AwURLRequestJobFactory);
   bool set_protocol = job_factory_->SetProtocolHandler(
       chrome::kFileScheme, new net::FileProtocolHandler());
   DCHECK(set_protocol);
   set_protocol = job_factory_->SetProtocolHandler(
       chrome::kDataScheme, new net::DataProtocolHandler());
   DCHECK(set_protocol);
   job_factory_->AddInterceptor(new AwRequestInterceptor());
+
+  job_factory_ = OnNetworkStackInitialized(url_request_context_.get(),
+                                           job_factory_.Pass());
   url_request_context_->set_job_factory(job_factory_.get());
-
-  OnNetworkStackInitialized(url_request_context_.get(),
-                            job_factory_.get());
 }
 
 content::ResourceContext* AwURLRequestContextGetter::GetResourceContext() {
   DCHECK(url_request_context_);
   if (!resource_context_)
     resource_context_.reset(new AwResourceContext(url_request_context_.get()));
   return resource_context_.get();
 }
 
 net::URLRequestContext* AwURLRequestContextGetter::GetURLRequestContext() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   return url_request_context_.get();
 }
 
 scoped_refptr<base::SingleThreadTaskRunner>
 AwURLRequestContextGetter::GetNetworkTaskRunner() const {
   return BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO);
 }
 
 }  // namespace android_webview