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/api/declarative | |
| 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/api/declarative')
3 files changed, 4 insertions, 5 deletions
diff --git a/chromium/extensions/browser/api/declarative/deduping_factory.h b/chromium/extensions/browser/api/declarative/deduping_factory.h index cb96e0f75fb..67c7033353a 100644 --- a/chromium/extensions/browser/api/declarative/deduping_factory.h +++ b/chromium/extensions/browser/api/declarative/deduping_factory.h @@ -12,8 +12,8 @@ #include <unordered_map> #include <unordered_set> +#include "base/check.h" #include "base/compiler_specific.h" -#include "base/logging.h" #include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/stl_util.h" diff --git a/chromium/extensions/browser/api/declarative/rules_registry.cc b/chromium/extensions/browser/api/declarative/rules_registry.cc index 30b767cdb39..fd6feb20da6 100644 --- a/chromium/extensions/browser/api/declarative/rules_registry.cc +++ b/chromium/extensions/browser/api/declarative/rules_registry.cc @@ -12,7 +12,6 @@ #include "base/stl_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/time/time.h" #include "base/values.h" #include "content/public/browser/browser_task_traits.h" @@ -348,8 +347,8 @@ void RulesRegistry::ProcessChangedRules(const std::string& extension_id) { std::vector<const api::events::Rule*> new_rules; GetRules(extension_id, &rules_, &new_rules); - base::PostTask( - FROM_HERE, {content::BrowserThread::UI}, + content::GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(&RulesCacheDelegate::UpdateRules, cache_delegate_, extension_id, RulesToValue(new_rules))); } diff --git a/chromium/extensions/browser/api/declarative/rules_registry_service.cc b/chromium/extensions/browser/api/declarative/rules_registry_service.cc index 9e76ebf145c..19f4de09c21 100644 --- a/chromium/extensions/browser/api/declarative/rules_registry_service.cc +++ b/chromium/extensions/browser/api/declarative/rules_registry_service.cc @@ -42,7 +42,7 @@ const int RulesRegistryService::kInvalidRulesRegistryID = -1; RulesRegistryService::RulesRegistryService(content::BrowserContext* context) : current_rules_registry_id_(kDefaultRulesRegistryID), - content_rules_registry_(NULL), + content_rules_registry_(nullptr), browser_context_(context) { if (browser_context_) { extension_registry_observer_.Add(ExtensionRegistry::Get(browser_context_)); |