[BrowserThread] Migration callers without full content:: namespace
Note to QA: This CL is purely mechanical and shouldn't be blamed
for future regressions on touched files.
This is a follow-up to https://chromium-review.googlesource.com/c/chromium/src/+/2211138
which already removed all usage using content::BrowserThread.
Hence this script now matches unqualified BrowserThread:: without
risking having "content::" be selected as "traits_before" by the regex
(ran on same revision as step #1).
content:: is now always added if outside namespace content {}
(deleting unused using content::BrowserThread; decls)
Script @ https://crbug.com/1026641#c92
(will TBR fdoray@ post-review for mechanical change)
[email protected]
AX-Relnotes: n/a.
Bug: 1026641
Change-Id: I51ae2f83eb17d19b54563fd9b4fc040d2aa0c948
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2212469
Commit-Queue: Gabriel Charette <[email protected]>
Reviewed-by: François Doray <[email protected]>
Cr-Commit-Position: refs/heads/master@{#772458}
diff --git a/content/browser/content_index/content_index_database.cc b/content/browser/content_index/content_index_database.cc
index 60bd3ae..27a2f4f 100644
--- a/content/browser/content_index/content_index_database.cc
+++ b/content/browser/content_index/content_index_database.cc
@@ -11,7 +11,6 @@
#include "base/memory/ptr_util.h"
#include "base/optional.h"
#include "base/stl_util.h"
-#include "base/task/post_task.h"
#include "base/time/time.h"
#include "content/browser/background_fetch/storage/image_helpers.h"
#include "content/browser/content_index/content_index.pb.h"
@@ -145,8 +144,8 @@
auto wrapped_callback = base::BindOnce(
[](blink::mojom::ContentIndexService::AddCallback callback,
blink::mojom::ContentIndexError error) {
- base::PostTask(FROM_HERE, {BrowserThread::UI},
- base::BindOnce(std::move(callback), error));
+ GetUIThreadTaskRunner({})->PostTask(
+ FROM_HERE, base::BindOnce(std::move(callback), error));
},
std::move(callback));
@@ -249,8 +248,8 @@
std::vector<ContentIndexEntry> entries;
entries.push_back(std::move(entry));
- base::PostTask(
- FROM_HERE, {BrowserThread::UI},
+ GetUIThreadTaskRunner({})->PostTask(
+ FROM_HERE,
base::BindOnce(&ContentIndexDatabase::NotifyProviderContentAdded,
weak_ptr_factory_ui_.GetWeakPtr(), std::move(entries)));
}
@@ -265,8 +264,8 @@
auto wrapped_callback = base::BindOnce(
[](blink::mojom::ContentIndexService::DeleteCallback callback,
blink::mojom::ContentIndexError error) {
- base::PostTask(FROM_HERE, {BrowserThread::UI},
- base::BindOnce(std::move(callback), error));
+ GetUIThreadTaskRunner({})->PostTask(
+ FROM_HERE, base::BindOnce(std::move(callback), error));
},
std::move(callback));
@@ -308,8 +307,8 @@
std::move(callback).Run(blink::mojom::ContentIndexError::NONE);
- base::PostTask(
- FROM_HERE, {BrowserThread::UI},
+ GetUIThreadTaskRunner({})->PostTask(
+ FROM_HERE,
base::BindOnce(&ContentIndexDatabase::NotifyProviderContentDeleted,
weak_ptr_factory_ui_.GetWeakPtr(),
service_worker_registration_id, origin, entry_id));
@@ -324,8 +323,8 @@
[](blink::mojom::ContentIndexService::GetDescriptionsCallback callback,
blink::mojom::ContentIndexError error,
std::vector<blink::mojom::ContentDescriptionPtr> descriptions) {
- base::PostTask(FROM_HERE, {BrowserThread::UI},
- base::BindOnce(std::move(callback), error,
+ GetUIThreadTaskRunner({})->PostTask(
+ FROM_HERE, base::BindOnce(std::move(callback), error,
std::move(descriptions)));
},
std::move(callback));
@@ -407,8 +406,8 @@
auto wrapped_callback = base::BindOnce(
[](ContentIndexContext::GetIconsCallback callback,
std::vector<SkBitmap> icons) {
- base::PostTask(FROM_HERE, {BrowserThread::UI},
- base::BindOnce(std::move(callback), std::move(icons)));
+ GetUIThreadTaskRunner({})->PostTask(
+ FROM_HERE, base::BindOnce(std::move(callback), std::move(icons)));
},
std::move(callback));
@@ -499,8 +498,8 @@
[](ContentIndexContext::GetAllEntriesCallback callback,
blink::mojom::ContentIndexError error,
std::vector<ContentIndexEntry> entries) {
- base::PostTask(
- FROM_HERE, {BrowserThread::UI},
+ GetUIThreadTaskRunner({})->PostTask(
+ FROM_HERE,
base::BindOnce(std::move(callback), error, std::move(entries)));
},
std::move(callback));
@@ -577,8 +576,8 @@
auto wrapped_callback = base::BindOnce(
[](ContentIndexContext::GetEntryCallback callback,
base::Optional<ContentIndexEntry> entry) {
- base::PostTask(FROM_HERE, {BrowserThread::UI},
- base::BindOnce(std::move(callback), std::move(entry)));
+ GetUIThreadTaskRunner({})->PostTask(
+ FROM_HERE, base::BindOnce(std::move(callback), std::move(entry)));
},
std::move(callback));