| Index: android_webview/browser/net/aw_url_request_context_getter.cc
|
| diff --git a/android_webview/browser/net/aw_url_request_context_getter.cc b/android_webview/browser/net/aw_url_request_context_getter.cc
|
| index eed948f0b17e84f6ad2ebf261ac7bf9486b93985..d773e0549c8fe9441a1870c324bd3dcc682e7768 100644
|
| --- a/android_webview/browser/net/aw_url_request_context_getter.cc
|
| +++ b/android_webview/browser/net/aw_url_request_context_getter.cc
|
| @@ -14,6 +14,7 @@
|
| #include "android_webview/browser/net/init_native_callback.h"
|
| #include "android_webview/common/aw_switches.h"
|
| #include "base/command_line.h"
|
| +#include "base/threading/sequenced_worker_pool.h"
|
| #include "content/public/browser/browser_thread.h"
|
| #include "content/public/browser/content_browser_client.h"
|
| #include "content/public/browser/cookie_store_factory.h"
|
| @@ -70,7 +71,10 @@ void AwURLRequestContextGetter::Init() {
|
| void AwURLRequestContextGetter::InitAsync() {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
|
|
|
| - net::URLRequestContextBuilder builder;
|
| + net::URLRequestContextBuilder builder(
|
| + content::BrowserThread::GetBlockingPool()->
|
| + GetTaskRunnerWithShutdownBehavior(
|
| + base::SequencedWorkerPool::SKIP_ON_SHUTDOWN));
|
| builder.set_user_agent(content::GetUserAgent(GURL()));
|
| builder.set_network_delegate(new AwNetworkDelegate());
|
| #if !defined(DISABLE_FTP_SUPPORT)
|
| @@ -123,7 +127,11 @@ net::URLRequestContext* AwURLRequestContextGetter::GetURLRequestContext() {
|
| if (!job_factory_) {
|
| scoped_ptr<AwURLRequestJobFactory> job_factory(new AwURLRequestJobFactory);
|
| bool set_protocol = job_factory->SetProtocolHandler(
|
| - chrome::kFileScheme, new net::FileProtocolHandler());
|
| + chrome::kFileScheme,
|
| + new net::FileProtocolHandler(
|
| + content::BrowserThread::GetBlockingPool()->
|
| + GetTaskRunnerWithShutdownBehavior(
|
| + base::SequencedWorkerPool::SKIP_ON_SHUTDOWN)));
|
| DCHECK(set_protocol);
|
| set_protocol = job_factory->SetProtocolHandler(
|
| chrome::kDataScheme, new net::DataProtocolHandler());
|
|
|