From 4d61ba751088f650fe5d22bbf88036e80ff19f0f Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 2 May 2016 14:48:25 +0200 Subject: Basic porting to Chromium 51 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Trivial changes in methods, arguments and types. Change-Id: Ic707c376249f816268223e696ed5f6251df1f85f Reviewed-by: Michael Brüning --- src/core/url_request_context_getter_qt.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/core/url_request_context_getter_qt.cpp') diff --git a/src/core/url_request_context_getter_qt.cpp b/src/core/url_request_context_getter_qt.cpp index 579e33b66..5fb324b6c 100644 --- a/src/core/url_request_context_getter_qt.cpp +++ b/src/core/url_request_context_getter_qt.cpp @@ -280,7 +280,7 @@ void URLRequestContextGetterQt::generateCookieStore() m_storage->set_cookie_store(0); m_cookieDelegate->setCookieMonster(0); - net::CookieStore* cookieStore = 0; + scoped_ptr cookieStore; switch (m_persistentCookiesPolicy) { case BrowserContextAdapter::NoPersistentCookies: cookieStore = @@ -310,10 +310,12 @@ void URLRequestContextGetterQt::generateCookieStore() ); break; } - m_storage->set_cookie_store(cookieStore); - net::CookieMonster * const cookieMonster = cookieStore->GetCookieMonster(); - cookieMonster->SetCookieableSchemes(kCookieableSchemes, arraysize(kCookieableSchemes)); + net::CookieMonster * const cookieMonster = static_cast(cookieStore.get()); + m_storage->set_cookie_store(std::move(cookieStore)); + + const std::vector cookieableSchemes(kCookieableSchemes, kCookieableSchemes + arraysize(kCookieableSchemes)); + cookieMonster->SetCookieableSchemes(cookieableSchemes); m_cookieDelegate->setCookieMonster(cookieMonster); } @@ -395,8 +397,6 @@ static bool doNetworkSessionParamsMatch(const net::HttpNetworkSession::Params &f return false; if (first.http_auth_handler_factory != second.http_auth_handler_factory) return false; - if (first.network_delegate != second.network_delegate) - return false; if (first.http_server_properties.get() != second.http_server_properties.get()) return false; if (first.ignore_certificate_errors != second.ignore_certificate_errors) @@ -419,7 +419,6 @@ net::HttpNetworkSession::Params URLRequestContextGetterQt::generateNetworkSessio network_session_params.proxy_service = m_urlRequestContext->proxy_service(); network_session_params.ssl_config_service = m_urlRequestContext->ssl_config_service(); network_session_params.http_auth_handler_factory = m_urlRequestContext->http_auth_handler_factory(); - network_session_params.network_delegate = m_networkDelegate.get(); network_session_params.http_server_properties = m_urlRequestContext->http_server_properties(); network_session_params.ignore_certificate_errors = m_ignoreCertificateErrors; network_session_params.host_resolver = m_urlRequestContext->host_resolver(); -- cgit v1.2.3