Merge remote-tracking branch 'origin/5.8' into 5.9

Change-Id: Iff6ab3c287c58d8ec84a1513460bfce5218e8a61

1 files changed, 7 insertions, 0 deletions

diff --git a/src/core/url_request_context_getter_qt.cpp b/src/core/url_request_context_getter_qt.cpp
index cabf44ac6..635b7c2d0 100644
--- a/src/core/url_request_context_getter_qt.cpp
+++ b/src/core/url_request_context_getter_qt.cpp
@@ -268,6 +268,7 @@ void URLRequestContextGetterQt::updateCookieStore()
 
     if (m_contextInitialized && !m_updateAllStorage && !m_updateCookieStore) {
         m_updateCookieStore = true;
+        m_updateHttpCache = true;
         content::BrowserThread::PostTask(content::BrowserThread::IO, FROM_HERE,
                                          base::Bind(&URLRequestContextGetterQt::generateCookieStore, this));
     }
@@ -337,6 +338,12 @@ void URLRequestContextGetterQt::generateCookieStore()
     const std::vector<std::string> cookieableSchemes(kCookieableSchemes, kCookieableSchemes + arraysize(kCookieableSchemes));
     cookieMonster->SetCookieableSchemes(cookieableSchemes);
     m_cookieDelegate->setCookieMonster(cookieMonster);
+
+    if (!m_updateAllStorage) {
+        Q_ASSERT(m_updateHttpCache);
+        // HttpCache needs to be regenerated when we generate a new channel id service
+        generateHttpCache();
+    }
 }
 
 void URLRequestContextGetterQt::updateUserAgent()