[Backport] Dependency for security bug 925035

Manual backport of patch originally reviewed on
https://chromium-review.googlesource.com/c/chromium/src/+/1712949:

Move CodeCacheHost and GeneratedCodeCache to UI thread

See the issue for more details. It doesn't look this needs to live on
IO thread, this patch moves all the code cache code onto UI thread
so that security check can become easier.

(Alternatively we can only move CodeCacheHost to UI thread
but leave everything else on IO thread or on a sequenced task runner.
e.g. https://chromium-review.googlesource.com/c/chromium/src/+/1705540)

Bug: 985681
Change-Id: I3a780902135b19d2c55a5b844c230aa694856667
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>

1 files changed, 8 insertions, 10 deletions

diff --git a/chromium/content/browser/code_cache/generated_code_cache_context.cc b/chromium/content/browser/code_cache/generated_code_cache_context.cc
index beb40b80224..738e8b95b59 100644
--- a/chromium/content/browser/code_cache/generated_code_cache_context.cc
+++ b/chromium/content/browser/code_cache/generated_code_cache_context.cc
@@ -20,14 +20,6 @@ void GeneratedCodeCacheContext::Initialize(const base::FilePath& path,
                                            int max_bytes) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
-  base::PostTaskWithTraits(
-      FROM_HERE, {BrowserThread::IO},
-      base::BindOnce(&GeneratedCodeCacheContext::InitializeOnIO, this, path,
-                     max_bytes));
-}
-
-void GeneratedCodeCacheContext::InitializeOnIO(const base::FilePath& path,
-                                               int max_bytes) {
   generated_js_code_cache_.reset(
       new GeneratedCodeCache(path.AppendASCII("js"), max_bytes,
                              GeneratedCodeCache::CodeCacheType::kJavaScript));
@@ -40,14 +32,20 @@ void GeneratedCodeCacheContext::InitializeOnIO(const base::FilePath& path,
   }
 }
 
+void GeneratedCodeCacheContext::Shutdown() {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  generated_js_code_cache_.reset();
+  generated_wasm_code_cache_.reset();
+}
+
 GeneratedCodeCache* GeneratedCodeCacheContext::generated_js_code_cache() const {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   return generated_js_code_cache_.get();
 }
 
 GeneratedCodeCache* GeneratedCodeCacheContext::generated_wasm_code_cache()
     const {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   return generated_wasm_code_cache_.get();
 }