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 85 matching lines @@
   url_request_context_.reset(builder.Build());
 
   scoped_ptr<AwURLRequestJobFactory> job_factory(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());
-  url_request_context_->set_job_factory(job_factory.get());
 
   // TODO(mnaganov): Fix URLRequestContextBuilder to use proper threads.
   net::HttpNetworkSession::Params network_session_params;
   PopulateNetworkSessionParams(&network_session_params);
   net::HttpCache* main_cache = new net::HttpCache(
       network_session_params,
       new net::HttpCache::DefaultBackend(
           net::DISK_CACHE,
           browser_context_->GetPath().Append(FILE_PATH_LITERAL("Cache")),
           10 * 1024 * 1024,  // 10M
           BrowserThread::GetMessageLoopProxyForThread(BrowserThread::CACHE)));
   main_http_factory_.reset(main_cache);
   url_request_context_->set_http_transaction_factory(main_cache);
 
-  OnNetworkStackInitialized(url_request_context_.get(),
-                            job_factory.get());
-  job_factory_ = job_factory.Pass();
+  job_factory_ = CreateAndroidJobFactoryAndCookieMonster(
+      url_request_context_.get(), job_factory.Pass());
+  url_request_context_->set_job_factory(job_factory_.get());
 }
 
 void AwURLRequestContextGetter::PopulateNetworkSessionParams(
     net::HttpNetworkSession::Params* params) {
   net::URLRequestContext* context = url_request_context_.get();
   params->host_resolver = context->host_resolver();
   params->cert_verifier = context->cert_verifier();
   params->server_bound_cert_service = context->server_bound_cert_service();
   params->transport_security_state = context->transport_security_state();
   params->proxy_service = context->proxy_service();
@@ skipping 15 matching lines @@
   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