Commit ba579425 authored by Jan Wilken Dörrie's avatar Jan Wilken Dörrie Committed by Commit Bot

[base] Apply BindOnceRewriter in //chrome/browser/android

This change applies the BindOnceRewriter in //chrome/browser/android.
This rewriter replaces calls to base::Bind and base::BindRepeating with
calls to base::BindOnce, in case the result is immediately assigned to a
base::OnceCallback. Given that base::RepeatingCallback is implicitly
convertible to base::OnceCallback, there is no change in functionality.

Steps:
  1. run_tool.py --tool base_bind_rewriters \
                 --tool-arg='--rewriter=bind_to_bind_once'
  2. git cl format

This CL was uploaded by git cl split.

R=twellington@chromium.org

Bug: 714018
Change-Id: Ib7bc83521f16b2ce741ff1ddc3e8b42aa9d1099f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2132149Reviewed-by: default avatarDavid Trainor <dtrainor@chromium.org>
Commit-Queue: Jan Wilken Dörrie <jdoerrie@chromium.org>
Cr-Commit-Position: refs/heads/master@{#760406}
parent 314acd5f
...@@ -267,7 +267,7 @@ void PartnerBookmarksReader::GetFaviconFromCacheOrServer( ...@@ -267,7 +267,7 @@ void PartnerBookmarksReader::GetFaviconFromCacheOrServer(
FaviconFetchedCallback callback) { FaviconFetchedCallback callback) {
GetLargeIconService()->GetLargeIconRawBitmapOrFallbackStyleForPageUrl( GetLargeIconService()->GetLargeIconRawBitmapOrFallbackStyleForPageUrl(
page_url, kPartnerBookmarksMinimumFaviconSizePx, desired_favicon_size_px, page_url, kPartnerBookmarksMinimumFaviconSizePx, desired_favicon_size_px,
base::Bind(&PartnerBookmarksReader::OnGetFaviconFromCacheFinished, base::BindOnce(&PartnerBookmarksReader::OnGetFaviconFromCacheFinished,
base::Unretained(this), page_url, base::Unretained(this), page_url,
base::Passed(std::move(callback)), fallback_to_server, base::Passed(std::move(callback)), fallback_to_server,
from_server, desired_favicon_size_px), from_server, desired_favicon_size_px),
...@@ -324,7 +324,8 @@ void PartnerBookmarksReader::OnGetFaviconFromCacheFinished( ...@@ -324,7 +324,8 @@ void PartnerBookmarksReader::OnGetFaviconFromCacheFinished(
->GetLargeIconOrFallbackStyleFromGoogleServerSkippingLocalCache( ->GetLargeIconOrFallbackStyleFromGoogleServerSkippingLocalCache(
page_url, false /* may_page_url_be_private */, page_url, false /* may_page_url_be_private */,
false /* should_trim_page_url_path */, traffic_annotation, false /* should_trim_page_url_path */, traffic_annotation,
base::Bind(&PartnerBookmarksReader::OnGetFaviconFromServerFinished, base::BindOnce(
&PartnerBookmarksReader::OnGetFaviconFromServerFinished,
base::Unretained(this), page_url, desired_favicon_size_px, base::Unretained(this), page_url, desired_favicon_size_px,
base::Passed(std::move(callback)))); base::Passed(std::move(callback))));
} }
......
...@@ -199,7 +199,7 @@ void NTPSnippetsBridge::FetchSuggestionImage( ...@@ -199,7 +199,7 @@ void NTPSnippetsBridge::FetchSuggestionImage(
content_suggestions_service_->FetchSuggestionImage( content_suggestions_service_->FetchSuggestionImage(
ContentSuggestion::ID(Category::FromIDValue(j_category_id), ContentSuggestion::ID(Category::FromIDValue(j_category_id),
ConvertJavaStringToUTF8(env, id_within_category)), ConvertJavaStringToUTF8(env, id_within_category)),
base::Bind(&NTPSnippetsBridge::OnImageFetched, base::BindOnce(&NTPSnippetsBridge::OnImageFetched,
weak_ptr_factory_.GetWeakPtr(), callback)); weak_ptr_factory_.GetWeakPtr(), callback));
} }
...@@ -216,7 +216,7 @@ void NTPSnippetsBridge::FetchSuggestionFavicon( ...@@ -216,7 +216,7 @@ void NTPSnippetsBridge::FetchSuggestionFavicon(
ContentSuggestion::ID(Category::FromIDValue(j_category_id), ContentSuggestion::ID(Category::FromIDValue(j_category_id),
ConvertJavaStringToUTF8(env, id_within_category)), ConvertJavaStringToUTF8(env, id_within_category)),
j_minimum_size_px, j_desired_size_px, j_minimum_size_px, j_desired_size_px,
base::Bind(&NTPSnippetsBridge::OnImageFetched, base::BindOnce(&NTPSnippetsBridge::OnImageFetched,
weak_ptr_factory_.GetWeakPtr(), callback)); weak_ptr_factory_.GetWeakPtr(), callback));
} }
...@@ -238,7 +238,7 @@ void NTPSnippetsBridge::Fetch( ...@@ -238,7 +238,7 @@ void NTPSnippetsBridge::Fetch(
category, category,
std::set<std::string>(known_suggestion_ids.begin(), std::set<std::string>(known_suggestion_ids.begin(),
known_suggestion_ids.end()), known_suggestion_ids.end()),
base::Bind(&NTPSnippetsBridge::OnSuggestionsFetched, base::BindOnce(&NTPSnippetsBridge::OnSuggestionsFetched,
weak_ptr_factory_.GetWeakPtr(), success_callback, weak_ptr_factory_.GetWeakPtr(), success_callback,
failure_callback, category)); failure_callback, category));
} }
......
...@@ -319,7 +319,7 @@ void OomInterventionTabHelper::OnNearOomDetected() { ...@@ -319,7 +319,7 @@ void OomInterventionTabHelper::OnNearOomDetected() {
DCHECK(!renderer_detection_timer_.IsRunning()); DCHECK(!renderer_detection_timer_.IsRunning());
renderer_detection_timer_.Start( renderer_detection_timer_.Start(
FROM_HERE, kRendererHighMemoryUsageDetectionWindow, FROM_HERE, kRendererHighMemoryUsageDetectionWindow,
base::BindRepeating(&OomInterventionTabHelper:: base::BindOnce(&OomInterventionTabHelper::
OnDetectionWindowElapsedWithoutHighMemoryUsage, OnDetectionWindowElapsedWithoutHighMemoryUsage,
weak_ptr_factory_.GetWeakPtr())); weak_ptr_factory_.GetWeakPtr()));
} }
......
...@@ -747,7 +747,7 @@ static void JNI_WebsitePreferenceBridge_FetchLocalStorageInfo( ...@@ -747,7 +747,7 @@ static void JNI_WebsitePreferenceBridge_FetchLocalStorageInfo(
auto local_storage_helper = auto local_storage_helper =
base::MakeRefCounted<browsing_data::LocalStorageHelper>(profile); base::MakeRefCounted<browsing_data::LocalStorageHelper>(profile);
local_storage_helper->StartFetching( local_storage_helper->StartFetching(
base::Bind(&OnLocalStorageModelInfoLoaded, profile, fetch_important, base::BindOnce(&OnLocalStorageModelInfoLoaded, profile, fetch_important,
ScopedJavaGlobalRef<jobject>(java_callback))); ScopedJavaGlobalRef<jobject>(java_callback)));
} }
......
...@@ -545,7 +545,7 @@ void GvrSchedulerDelegate::SubmitDrawnFrame(FrameType frame_type, ...@@ -545,7 +545,7 @@ void GvrSchedulerDelegate::SubmitDrawnFrame(FrameType frame_type,
} }
if (fence) { if (fence) {
webxr_delayed_gvr_submit_.Reset( webxr_delayed_gvr_submit_.Reset(
base::BindRepeating(&GvrSchedulerDelegate::DrawFrameSubmitWhenReady, base::BindOnce(&GvrSchedulerDelegate::DrawFrameSubmitWhenReady,
base::Unretained(this))); base::Unretained(this)));
task_runner()->PostTask( task_runner()->PostTask(
FROM_HERE, base::BindOnce(webxr_delayed_gvr_submit_.callback(), FROM_HERE, base::BindOnce(webxr_delayed_gvr_submit_.callback(),
...@@ -574,7 +574,7 @@ void GvrSchedulerDelegate::DrawFrameSubmitWhenReady( ...@@ -574,7 +574,7 @@ void GvrSchedulerDelegate::DrawFrameSubmitWhenReady(
} }
if (!fence->HasCompleted()) { if (!fence->HasCompleted()) {
webxr_delayed_gvr_submit_.Reset( webxr_delayed_gvr_submit_.Reset(
base::BindRepeating(&GvrSchedulerDelegate::DrawFrameSubmitWhenReady, base::BindOnce(&GvrSchedulerDelegate::DrawFrameSubmitWhenReady,
base::Unretained(this))); base::Unretained(this)));
if (use_polling) { if (use_polling) {
// Poll the fence status at a short interval. This burns some CPU, but // Poll the fence status at a short interval. This burns some CPU, but
......
...@@ -11,6 +11,5 @@ int main(int argc, char** argv) { ...@@ -11,6 +11,5 @@ int main(int argc, char** argv) {
return base::LaunchUnitTests( return base::LaunchUnitTests(
argc, argv, argc, argv,
base::BindRepeating(&vr::ArTestSuite::Run, base::BindOnce(&vr::ArTestSuite::Run, base::Unretained(&test_suite)));
base::Unretained(&test_suite)));
} }
...@@ -485,45 +485,44 @@ void VrGLThread::UpdateWebInputIndices(int selection_start, ...@@ -485,45 +485,44 @@ void VrGLThread::UpdateWebInputIndices(int selection_start,
int composition_end) { int composition_end) {
task_runner()->PostTask( task_runner()->PostTask(
FROM_HERE, FROM_HERE,
base::BindRepeating(&BrowserUiInterface::UpdateWebInputIndices, base::BindOnce(&BrowserUiInterface::UpdateWebInputIndices,
weak_browser_ui_, selection_start, selection_end, weak_browser_ui_, selection_start, selection_end,
composition_start, composition_end)); composition_start, composition_end));
} }
void VrGLThread::OnSwapContents(int new_content_id) { void VrGLThread::OnSwapContents(int new_content_id) {
task_runner()->PostTask( task_runner()->PostTask(FROM_HERE,
FROM_HERE, base::BindRepeating(&BrowserUiInterface::OnSwapContents, base::BindOnce(&BrowserUiInterface::OnSwapContents,
weak_browser_ui_, new_content_id)); weak_browser_ui_, new_content_id));
} }
void VrGLThread::SetDialogLocation(float x, float y) { void VrGLThread::SetDialogLocation(float x, float y) {
task_runner()->PostTask( task_runner()->PostTask(FROM_HERE,
FROM_HERE, base::BindRepeating(&BrowserUiInterface::SetDialogLocation, base::BindOnce(&BrowserUiInterface::SetDialogLocation,
weak_browser_ui_, x, y)); weak_browser_ui_, x, y));
} }
void VrGLThread::SetDialogFloating(bool floating) { void VrGLThread::SetDialogFloating(bool floating) {
task_runner()->PostTask( task_runner()->PostTask(FROM_HERE,
FROM_HERE, base::BindRepeating(&BrowserUiInterface::SetDialogFloating, base::BindOnce(&BrowserUiInterface::SetDialogFloating,
weak_browser_ui_, floating)); weak_browser_ui_, floating));
} }
void VrGLThread::ShowPlatformToast(const base::string16& text) { void VrGLThread::ShowPlatformToast(const base::string16& text) {
task_runner()->PostTask( task_runner()->PostTask(FROM_HERE,
FROM_HERE, base::BindRepeating(&BrowserUiInterface::ShowPlatformToast, base::BindOnce(&BrowserUiInterface::ShowPlatformToast,
weak_browser_ui_, text)); weak_browser_ui_, text));
} }
void VrGLThread::CancelPlatformToast() { void VrGLThread::CancelPlatformToast() {
task_runner()->PostTask( task_runner()->PostTask(
FROM_HERE, base::BindRepeating(&BrowserUiInterface::CancelPlatformToast, FROM_HERE, base::BindOnce(&BrowserUiInterface::CancelPlatformToast,
weak_browser_ui_)); weak_browser_ui_));
} }
void VrGLThread::OnContentBoundsChanged(int width, int height) { void VrGLThread::OnContentBoundsChanged(int width, int height) {
task_runner()->PostTask( task_runner()->PostTask(
FROM_HERE, FROM_HERE, base::BindOnce(&BrowserUiInterface::OnContentBoundsChanged,
base::BindRepeating(&BrowserUiInterface::OnContentBoundsChanged,
weak_browser_ui_, width, height)); weak_browser_ui_, width, height));
} }
......
...@@ -177,7 +177,7 @@ VrShell::VrShell(JNIEnv* env, ...@@ -177,7 +177,7 @@ VrShell::VrShell(JNIEnv* env,
if (!can_load_new_assets_) { if (!can_load_new_assets_) {
waiting_for_assets_component_timer_.Start( waiting_for_assets_component_timer_.Start(
FROM_HERE, kAssetsComponentWaitDelay, FROM_HERE, kAssetsComponentWaitDelay,
base::BindRepeating(&VrShell::OnAssetsComponentWaitTimeout, base::BindOnce(&VrShell::OnAssetsComponentWaitTimeout,
weak_ptr_factory_.GetWeakPtr())); weak_ptr_factory_.GetWeakPtr()));
} }
...@@ -954,7 +954,7 @@ void VrShell::PollCapturingState() { ...@@ -954,7 +954,7 @@ void VrShell::PollCapturingState() {
} }
} }
geolocation_config_->IsHighAccuracyLocationBeingCaptured(base::BindRepeating( geolocation_config_->IsHighAccuracyLocationBeingCaptured(base::BindOnce(
[](VrShell* shell, BrowserUiInterface* ui, [](VrShell* shell, BrowserUiInterface* ui,
CapturingStateModel* active_capturing, CapturingStateModel* active_capturing,
CapturingStateModel* background_capturing, CapturingStateModel* background_capturing,
......
...@@ -125,7 +125,7 @@ WebApkIconHasher::WebApkIconHasher( ...@@ -125,7 +125,7 @@ WebApkIconHasher::WebApkIconHasher(
download_timeout_timer_.Start( download_timeout_timer_.Start(
FROM_HERE, base::TimeDelta::FromMilliseconds(timeout_ms), FROM_HERE, base::TimeDelta::FromMilliseconds(timeout_ms),
base::Bind(&WebApkIconHasher::OnDownloadTimedOut, base::BindOnce(&WebApkIconHasher::OnDownloadTimedOut,
base::Unretained(this))); base::Unretained(this)));
auto resource_request = std::make_unique<network::ResourceRequest>(); auto resource_request = std::make_unique<network::ResourceRequest>();
......
...@@ -55,7 +55,7 @@ void WebApkInstallService::InstallAsync(content::WebContents* web_contents, ...@@ -55,7 +55,7 @@ void WebApkInstallService::InstallAsync(content::WebContents* web_contents,
auto observer = std::make_unique<LifetimeObserver>(web_contents); auto observer = std::make_unique<LifetimeObserver>(web_contents);
WebApkInstaller::InstallAsync( WebApkInstaller::InstallAsync(
browser_context_, shortcut_info, primary_icon, is_primary_icon_maskable, browser_context_, shortcut_info, primary_icon, is_primary_icon_maskable,
base::Bind(&WebApkInstallService::OnFinishedInstall, base::BindOnce(&WebApkInstallService::OnFinishedInstall,
weak_ptr_factory_.GetWeakPtr(), base::Passed(&observer), weak_ptr_factory_.GetWeakPtr(), base::Passed(&observer),
shortcut_info, primary_icon, is_primary_icon_maskable)); shortcut_info, primary_icon, is_primary_icon_maskable));
} }
......
...@@ -702,7 +702,7 @@ void WebApkInstaller::SendRequest( ...@@ -702,7 +702,7 @@ void WebApkInstaller::SendRequest(
timer_.Start( timer_.Start(
FROM_HERE, base::TimeDelta::FromMilliseconds(webapk_server_timeout_ms_), FROM_HERE, base::TimeDelta::FromMilliseconds(webapk_server_timeout_ms_),
base::Bind(&WebApkInstaller::OnResult, weak_ptr_factory_.GetWeakPtr(), base::BindOnce(&WebApkInstaller::OnResult, weak_ptr_factory_.GetWeakPtr(),
WebApkInstallResult::FAILURE)); WebApkInstallResult::FAILURE));
auto request = std::make_unique<network::ResourceRequest>(); auto request = std::make_unique<network::ResourceRequest>();
......
...@@ -175,7 +175,7 @@ void WebApkUpdateDataFetcher::OnDidGetInstallableData( ...@@ -175,7 +175,7 @@ void WebApkUpdateDataFetcher::OnDidGetInstallableData(
->GetURLLoaderFactoryForBrowserProcess() ->GetURLLoaderFactoryForBrowserProcess()
.get(), .get(),
url::Origin::Create(last_fetched_url_), urls, url::Origin::Create(last_fetched_url_), urls,
base::Bind(&WebApkUpdateDataFetcher::OnGotIconMurmur2Hashes, base::BindOnce(&WebApkUpdateDataFetcher::OnGotIconMurmur2Hashes,
weak_ptr_factory_.GetWeakPtr())); weak_ptr_factory_.GetWeakPtr()));
} }
......
...@@ -224,5 +224,5 @@ static void JNI_WebApkUpdateManager_UpdateWebApkFromFile( ...@@ -224,5 +224,5 @@ static void JNI_WebApkUpdateManager_UpdateWebApkFromFile(
ConvertJavaStringToUTF8(env, java_update_request_path); ConvertJavaStringToUTF8(env, java_update_request_path);
WebApkInstallService::Get(profile)->UpdateAsync( WebApkInstallService::Get(profile)->UpdateAsync(
base::FilePath(update_request_path), base::FilePath(update_request_path),
base::Bind(&OnUpdated, callback_ref)); base::BindOnce(&OnUpdated, callback_ref));
} }
...@@ -134,7 +134,7 @@ AddToHomescreenDataFetcher::AddToHomescreenDataFetcher( ...@@ -134,7 +134,7 @@ AddToHomescreenDataFetcher::AddToHomescreenDataFetcher(
// Bind the InterfacePtr into the callback so that it's kept alive until // Bind the InterfacePtr into the callback so that it's kept alive until
// there's either a connection error or a response. // there's either a connection error or a response.
auto* web_app_info_proxy = chrome_render_frame.get(); auto* web_app_info_proxy = chrome_render_frame.get();
web_app_info_proxy->GetWebApplicationInfo(base::Bind( web_app_info_proxy->GetWebApplicationInfo(base::BindOnce(
&AddToHomescreenDataFetcher::OnDidGetWebApplicationInfo, &AddToHomescreenDataFetcher::OnDidGetWebApplicationInfo,
weak_ptr_factory_.GetWeakPtr(), base::Passed(&chrome_render_frame))); weak_ptr_factory_.GetWeakPtr(), base::Passed(&chrome_render_frame)));
} }
...@@ -188,7 +188,7 @@ void AddToHomescreenDataFetcher::OnDidGetWebApplicationInfo( ...@@ -188,7 +188,7 @@ void AddToHomescreenDataFetcher::OnDidGetWebApplicationInfo(
// worst, a dynamically-generated launcher icon. // worst, a dynamically-generated launcher icon.
data_timeout_timer_.Start( data_timeout_timer_.Start(
FROM_HERE, data_timeout_ms_, FROM_HERE, data_timeout_ms_,
base::Bind(&AddToHomescreenDataFetcher::OnDataTimedout, base::BindOnce(&AddToHomescreenDataFetcher::OnDataTimedout,
weak_ptr_factory_.GetWeakPtr())); weak_ptr_factory_.GetWeakPtr()));
start_time_ = base::TimeTicks::Now(); start_time_ = base::TimeTicks::Now();
...@@ -316,7 +316,7 @@ void AddToHomescreenDataFetcher::FetchFavicon() { ...@@ -316,7 +316,7 @@ void AddToHomescreenDataFetcher::FetchFavicon() {
ShortcutHelper::GetIdealHomescreenIconSizeInPx() - 1; ShortcutHelper::GetIdealHomescreenIconSizeInPx() - 1;
favicon_service->GetLargestRawFaviconForPageURL( favicon_service->GetLargestRawFaviconForPageURL(
shortcut_info_.url, icon_types, threshold_to_get_any_largest_icon, shortcut_info_.url, icon_types, threshold_to_get_any_largest_icon,
base::Bind(&AddToHomescreenDataFetcher::OnFaviconFetched, base::BindOnce(&AddToHomescreenDataFetcher::OnFaviconFetched,
weak_ptr_factory_.GetWeakPtr()), weak_ptr_factory_.GetWeakPtr()),
&favicon_task_tracker_); &favicon_task_tracker_);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment