diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/extensions/browser/value_store | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/extensions/browser/value_store')
| -rw-r--r-- | chromium/extensions/browser/value_store/lazy_leveldb.cc | 2 | ||||
| -rw-r--r-- | chromium/extensions/browser/value_store/value_store_frontend.cc | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/chromium/extensions/browser/value_store/lazy_leveldb.cc b/chromium/extensions/browser/value_store/lazy_leveldb.cc index afb48169eea..b8138730d31 100644 --- a/chromium/extensions/browser/value_store/lazy_leveldb.cc +++ b/chromium/extensions/browser/value_store/lazy_leveldb.cc @@ -102,7 +102,7 @@ ValueStore::Status LazyLevelDb::Read(const std::string& key, return ToValueStoreError(s); base::Optional<base::Value> read_value = - base::JSONReader().ReadToValue(value_as_json); + base::JSONReader::Read(value_as_json); if (!read_value) { return ValueStore::Status(ValueStore::CORRUPTION, FixCorruption(&key), kInvalidJson); diff --git a/chromium/extensions/browser/value_store/value_store_frontend.cc b/chromium/extensions/browser/value_store/value_store_frontend.cc index 9a7cebcda08..3391c0da5cf 100644 --- a/chromium/extensions/browser/value_store/value_store_frontend.cc +++ b/chromium/extensions/browser/value_store/value_store_frontend.cc @@ -11,7 +11,6 @@ #include "base/logging.h" #include "base/macros.h" #include "base/memory/scoped_refptr.h" -#include "base/task/post_task.h" #include "base/trace_event/trace_event.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" @@ -45,8 +44,8 @@ class ValueStoreFrontend::Backend : public base::RefCountedThreadSafe<Backend> { << " failed: " << result.status().message; } - base::PostTask(FROM_HERE, {BrowserThread::UI}, - base::BindOnce(&ValueStoreFrontend::Backend::RunCallback, + content::GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(&ValueStoreFrontend::Backend::RunCallback, this, std::move(callback), std::move(value))); } |