diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2013-12-06 20:56:07 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-20 11:05:27 +0100 |
| commit | c86631a070b423ea594ca860c05b7ce7c87d82e0 (patch) | |
| tree | df63dd51ae0d18bac501ac9ba1b8352854db1947 /src/core/url_request_context_getter_qt.cpp | |
| parent | 39a0d09358a8cae4a3d65ed13b81a810355571e5 (diff) | |
Adapt to chromium API changes in refs/branch-heads/1650
This patch also updates src/3rparty to the new snapshot.
Change-Id: I56da8d795051a828d7b375e57c4dda8bc570229f
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'src/core/url_request_context_getter_qt.cpp')
| -rw-r--r-- | src/core/url_request_context_getter_qt.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/core/url_request_context_getter_qt.cpp b/src/core/url_request_context_getter_qt.cpp index 90219be4e..75ec94e6e 100644 --- a/src/core/url_request_context_getter_qt.cpp +++ b/src/core/url_request_context_getter_qt.cpp @@ -43,6 +43,7 @@ #include "base/strings/string_util.h" #include "base/threading/worker_pool.h" +#include "base/threading/sequenced_worker_pool.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/cookie_store_factory.h" #include "net/base/cache_type.h" @@ -95,7 +96,7 @@ net::URLRequestContext *URLRequestContextGetterQt::GetURLRequestContext() m_urlRequestContext->set_network_delegate(m_networkDelegate.get()); base::FilePath cookiesPath = m_basePath.Append(FILE_PATH_LITERAL("Cookies")); - scoped_refptr<net::CookieStore> cookieStore = content::CreatePersistentCookieStore(cookiesPath, true, NULL, NULL); + scoped_refptr<net::CookieStore> cookieStore = content::CreatePersistentCookieStore(cookiesPath, true, NULL, NULL, scoped_refptr<base::SequencedTaskRunner>()); cookieStore->GetCookieMonster()->SetPersistSessionCookies(true); m_storage.reset(new net::URLRequestContextStorage(m_urlRequestContext.get())); @@ -163,7 +164,9 @@ net::URLRequestContext *URLRequestContextGetterQt::GetURLRequestContext() m_jobFactory.reset(new net::URLRequestJobFactoryImpl()); m_jobFactory->SetProtocolHandler(chrome::kDataScheme, new net::DataProtocolHandler()); - m_jobFactory->SetProtocolHandler(chrome::kFileScheme, new net::FileProtocolHandler()); + m_jobFactory->SetProtocolHandler( + chrome::kFileScheme, + new net::FileProtocolHandler(content::BrowserThread::GetBlockingPool()->GetTaskRunnerWithShutdownBehavior(base::SequencedWorkerPool::SKIP_ON_SHUTDOWN))); m_jobFactory->SetProtocolHandler(kQrcSchemeQt, new QrcProtocolHandlerQt()); m_jobFactory->SetProtocolHandler(chrome::kFtpScheme, new net::FtpProtocolHandler( new net::FtpNetworkLayer(m_urlRequestContext->host_resolver()))); |