Commit a2feca30 authored by Tomasz Tylenda's avatar Tomasz Tylenda Committed by Commit Bot

Migrate base::Bind to base::BindRepeating.

This changelist tackles code locations where the caller explicitly
requires base::RepeatingCallback (or RepeatingClosure).

BUG=764795
TESTED=build

Change-Id: If4ab805076529ffbe76443849761bacda2b724af
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2463051Reviewed-by: default avatarHidehiko Abe <hidehiko@chromium.org>
Commit-Queue: Tomasz Tylenda <ttylenda@chromium.org>
Cr-Commit-Position: refs/heads/master@{#816861}
parent a2233f70
...@@ -261,9 +261,9 @@ ArcAccessibilityHelperBridge::ArcAccessibilityHelperBridge( ...@@ -261,9 +261,9 @@ ArcAccessibilityHelperBridge::ArcAccessibilityHelperBridge(
for (const char* const pref_name : kCaptionStylePrefsToObserve) { for (const char* const pref_name : kCaptionStylePrefsToObserve) {
pref_change_registrar_->Add( pref_change_registrar_->Add(
pref_name, pref_name, base::BindRepeating(
base::Bind(&ArcAccessibilityHelperBridge::UpdateCaptionSettings, &ArcAccessibilityHelperBridge::UpdateCaptionSettings,
base::Unretained(this))); base::Unretained(this)));
} }
arc_bridge_service_->accessibility_helper()->SetHost(this); arc_bridge_service_->accessibility_helper()->SetHost(this);
......
...@@ -66,14 +66,15 @@ ArcCastReceiverService::ArcCastReceiverService(content::BrowserContext* context, ...@@ -66,14 +66,15 @@ ArcCastReceiverService::ArcCastReceiverService(content::BrowserContext* context,
// because we own |pref_change_registrar_|. // because we own |pref_change_registrar_|.
pref_change_registrar_->Add( pref_change_registrar_->Add(
prefs::kCastReceiverEnabled, prefs::kCastReceiverEnabled,
base::Bind(&ArcCastReceiverService::OnCastReceiverEnabledChanged, base::BindRepeating(&ArcCastReceiverService::OnCastReceiverEnabledChanged,
base::Unretained(this))); base::Unretained(this)));
receiver_name_subscription_ = receiver_name_subscription_ =
chromeos::CrosSettings::Get()->AddSettingsObserver( chromeos::CrosSettings::Get()->AddSettingsObserver(
chromeos::kCastReceiverName, chromeos::kCastReceiverName,
base::Bind(&ArcCastReceiverService::OnCastReceiverNameChanged, base::BindRepeating(
base::Unretained(this))); &ArcCastReceiverService::OnCastReceiverNameChanged,
base::Unretained(this)));
} }
ArcCastReceiverService::~ArcCastReceiverService() { ArcCastReceiverService::~ArcCastReceiverService() {
......
...@@ -258,8 +258,8 @@ void ArcFileSystemWatcherService::FileSystemWatcher::Start() { ...@@ -258,8 +258,8 @@ void ArcFileSystemWatcherService::FileSystemWatcher::Start() {
watcher_ = std::make_unique<base::FilePathWatcher>(); watcher_ = std::make_unique<base::FilePathWatcher>();
// On Linux, base::FilePathWatcher::Watch() always returns true. // On Linux, base::FilePathWatcher::Watch() always returns true.
watcher_->Watch(cros_dir_, true, watcher_->Watch(cros_dir_, true,
base::Bind(&FileSystemWatcher::OnFilePathChanged, base::BindRepeating(&FileSystemWatcher::OnFilePathChanged,
weak_ptr_factory_.GetWeakPtr())); weak_ptr_factory_.GetWeakPtr()));
} }
void ArcFileSystemWatcherService::FileSystemWatcher::OnFilePathChanged( void ArcFileSystemWatcherService::FileSystemWatcher::OnFilePathChanged(
......
...@@ -1168,7 +1168,7 @@ TEST_F(ArcDocumentsProviderRootTest, MoveFileOnReadOnlyRoot) { ...@@ -1168,7 +1168,7 @@ TEST_F(ArcDocumentsProviderRootTest, MoveFileOnReadOnlyRoot) {
TEST_F(ArcDocumentsProviderRootTest, WatchChanged) { TEST_F(ArcDocumentsProviderRootTest, WatchChanged) {
int num_called = 0; int num_called = 0;
auto watcher_callback = base::Bind( auto watcher_callback = base::BindRepeating(
[](int* num_called, ChangeType type) { [](int* num_called, ChangeType type) {
EXPECT_EQ(ChangeType::CHANGED, type); EXPECT_EQ(ChangeType::CHANGED, type);
++(*num_called); ++(*num_called);
...@@ -1218,7 +1218,7 @@ TEST_F(ArcDocumentsProviderRootTest, WatchChanged) { ...@@ -1218,7 +1218,7 @@ TEST_F(ArcDocumentsProviderRootTest, WatchChanged) {
TEST_F(ArcDocumentsProviderRootTest, WatchDeleted) { TEST_F(ArcDocumentsProviderRootTest, WatchDeleted) {
int num_called = 0; int num_called = 0;
auto watcher_callback = base::Bind( auto watcher_callback = base::BindRepeating(
[](int* num_called, ChangeType type) { [](int* num_called, ChangeType type) {
EXPECT_EQ(ChangeType::DELETED, type); EXPECT_EQ(ChangeType::DELETED, type);
++(*num_called); ++(*num_called);
......
...@@ -27,19 +27,21 @@ ArcOptInPreferenceHandler::ArcOptInPreferenceHandler( ...@@ -27,19 +27,21 @@ ArcOptInPreferenceHandler::ArcOptInPreferenceHandler(
void ArcOptInPreferenceHandler::Start() { void ArcOptInPreferenceHandler::Start() {
reporting_consent_subscription_ = reporting_consent_subscription_ =
chromeos::StatsReportingController::Get()->AddObserver( chromeos::StatsReportingController::Get()->AddObserver(
base::Bind(&ArcOptInPreferenceHandler::OnMetricsPreferenceChanged, base::BindRepeating(
base::Unretained(this))); &ArcOptInPreferenceHandler::OnMetricsPreferenceChanged,
base::Unretained(this)));
pref_change_registrar_.Init(pref_service_); pref_change_registrar_.Init(pref_service_);
pref_change_registrar_.Add( pref_change_registrar_.Add(
prefs::kArcBackupRestoreEnabled, prefs::kArcBackupRestoreEnabled,
base::Bind( base::BindRepeating(
&ArcOptInPreferenceHandler::OnBackupAndRestorePreferenceChanged, &ArcOptInPreferenceHandler::OnBackupAndRestorePreferenceChanged,
base::Unretained(this))); base::Unretained(this)));
pref_change_registrar_.Add( pref_change_registrar_.Add(
prefs::kArcLocationServiceEnabled, prefs::kArcLocationServiceEnabled,
base::Bind(&ArcOptInPreferenceHandler::OnLocationServicePreferenceChanged, base::BindRepeating(
base::Unretained(this))); &ArcOptInPreferenceHandler::OnLocationServicePreferenceChanged,
base::Unretained(this)));
// Send current state. // Send current state.
SendMetricsMode(); SendMetricsMode();
......
...@@ -51,8 +51,9 @@ void ArcPlayStoreEnabledPreferenceHandler::Start() { ...@@ -51,8 +51,9 @@ void ArcPlayStoreEnabledPreferenceHandler::Start() {
pref_change_registrar_.Init(profile_->GetPrefs()); pref_change_registrar_.Init(profile_->GetPrefs());
pref_change_registrar_.Add( pref_change_registrar_.Add(
prefs::kArcEnabled, prefs::kArcEnabled,
base::Bind(&ArcPlayStoreEnabledPreferenceHandler::OnPreferenceChanged, base::BindRepeating(
weak_ptr_factory_.GetWeakPtr())); &ArcPlayStoreEnabledPreferenceHandler::OnPreferenceChanged,
weak_ptr_factory_.GetWeakPtr()));
const bool is_play_store_enabled = IsArcPlayStoreEnabledForProfile(profile_); const bool is_play_store_enabled = IsArcPlayStoreEnabledForProfile(profile_);
VLOG(1) << "Start observing Google Play Store enabled preference. " VLOG(1) << "Start observing Google Play Store enabled preference. "
......
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