diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-02-01 12:19:37 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-03-15 16:52:24 +0000 |
| commit | 6b35497375c07c49cca7317a4452acc6adc7a1cd (patch) | |
| tree | 5531da6c89bb3da6495e8c83a0b86bff638f3baa /src/core/url_request_context_getter_qt.cpp | |
| parent | 91e13af7e1056a7bad83eb34ebf63fdd45e24bea (diff) | |
Basic adaptations for 65-based
Change-Id: I121b14d6a44e80f5eea4b159c58f7010d472926e
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'src/core/url_request_context_getter_qt.cpp')
| -rw-r--r-- | src/core/url_request_context_getter_qt.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/core/url_request_context_getter_qt.cpp b/src/core/url_request_context_getter_qt.cpp index 7f78cbc20..3b041639e 100644 --- a/src/core/url_request_context_getter_qt.cpp +++ b/src/core/url_request_context_getter_qt.cpp @@ -202,9 +202,9 @@ void URLRequestContextGetterQt::cancelAllUrlRequests() Q_ASSERT(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); Q_ASSERT(m_urlRequestContext); - const std::set<const net::URLRequest*>& url_requests = m_urlRequestContext->url_requests(); - std::set<const net::URLRequest*>::const_iterator it = url_requests.begin(); - std::set<const net::URLRequest*>::const_iterator end = url_requests.end(); + const std::set<const net::URLRequest*> *url_requests = m_urlRequestContext->url_requests(); + std::set<const net::URLRequest*>::const_iterator it = url_requests->begin(); + std::set<const net::URLRequest*>::const_iterator end = url_requests->end(); for ( ; it != end; ++it) { net::URLRequest* request = const_cast<net::URLRequest*>(*it); if (request) @@ -339,7 +339,8 @@ void URLRequestContextGetterQt::generateCookieStore() cookieStore = content::CreateCookieStore( content::CookieStoreConfig( base::FilePath(), - content::CookieStoreConfig::EPHEMERAL_SESSION_COOKIES, + false, + false, nullptr) ); break; @@ -347,7 +348,8 @@ void URLRequestContextGetterQt::generateCookieStore() cookieStore = content::CreateCookieStore( content::CookieStoreConfig( toFilePath(m_cookiesPath), - content::CookieStoreConfig::PERSISTANT_SESSION_COOKIES, + false, + true, nullptr) ); break; @@ -355,7 +357,8 @@ void URLRequestContextGetterQt::generateCookieStore() cookieStore = content::CreateCookieStore( content::CookieStoreConfig( toFilePath(m_cookiesPath), - content::CookieStoreConfig::RESTORED_SESSION_COOKIES, + true, + true, nullptr) ); break; |