Commit 93cd283b authored by Reilly Grant's avatar Reilly Grant Committed by Chromium LUCI CQ

Convert callbacks in //chrome/browser/chromeos/profiles

This change converts callbacks from base::Bind and base::Callback to
Once/Repeating in //chrome/browser/chromeos/profiles.

Bug: 1148570
Change-Id: I657d9decc3489b8883957b55fb05ff62e4143c01
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2639149
Commit-Queue: Mitsuru Oshima <oshima@chromium.org>
Reviewed-by: default avatarMitsuru Oshima <oshima@chromium.org>
Auto-Submit: Reilly Grant <reillyg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#845561}
parent 898dcda5
...@@ -150,7 +150,7 @@ class ProfileHelperImpl : public ProfileHelper, ...@@ -150,7 +150,7 @@ class ProfileHelperImpl : public ProfileHelper,
void ProfileStartup(Profile* profile) override; void ProfileStartup(Profile* profile) override;
base::FilePath GetActiveUserProfileDir() override; base::FilePath GetActiveUserProfileDir() override;
void Initialize() override; void Initialize() override;
void ClearSigninProfile(const base::Closure& on_clear_callback) override; void ClearSigninProfile(base::OnceClosure on_clear_callback) override;
Profile* GetProfileByAccountId(const AccountId& account_id) override; Profile* GetProfileByAccountId(const AccountId& account_id) override;
Profile* GetProfileByUser(const user_manager::User* user) override; Profile* GetProfileByUser(const user_manager::User* user) override;
...@@ -189,10 +189,10 @@ class ProfileHelperImpl : public ProfileHelper, ...@@ -189,10 +189,10 @@ class ProfileHelperImpl : public ProfileHelper,
std::string active_user_id_hash_; std::string active_user_id_hash_;
// List of callbacks called after signin profile clearance. // List of callbacks called after signin profile clearance.
std::vector<base::Closure> on_clear_callbacks_; std::vector<base::OnceClosure> on_clear_callbacks_;
// Called when a single stage of profile clearing is finished. // Called when a single stage of profile clearing is finished.
base::Closure on_clear_profile_stage_finished_; base::RepeatingClosure on_clear_profile_stage_finished_;
// A currently running browsing data remover. // A currently running browsing data remover.
content::BrowsingDataRemover* browsing_data_remover_ = nullptr; content::BrowsingDataRemover* browsing_data_remover_ = nullptr;
...@@ -454,8 +454,8 @@ void ProfileHelperImpl::Initialize() { ...@@ -454,8 +454,8 @@ void ProfileHelperImpl::Initialize() {
} }
void ProfileHelperImpl::ClearSigninProfile( void ProfileHelperImpl::ClearSigninProfile(
const base::Closure& on_clear_callback) { base::OnceClosure on_clear_callback) {
on_clear_callbacks_.push_back(on_clear_callback); on_clear_callbacks_.push_back(std::move(on_clear_callback));
// Profile is already clearing. // Profile is already clearing.
if (on_clear_callbacks_.size() > 1) if (on_clear_callbacks_.size() > 1)
...@@ -642,11 +642,11 @@ user_manager::User* ProfileHelperImpl::GetUserByProfile( ...@@ -642,11 +642,11 @@ user_manager::User* ProfileHelperImpl::GetUserByProfile(
} }
void ProfileHelperImpl::OnSigninProfileCleared() { void ProfileHelperImpl::OnSigninProfileCleared() {
std::vector<base::Closure> callbacks; std::vector<base::OnceClosure> callbacks;
callbacks.swap(on_clear_callbacks_); callbacks.swap(on_clear_callbacks_);
for (const base::Closure& callback : callbacks) { for (auto& callback : callbacks) {
if (!callback.is_null()) if (!callback.is_null())
callback.Run(); std::move(callback).Run();
} }
} }
...@@ -674,7 +674,7 @@ void ProfileHelperImpl::OnSessionRestoreStateChanged( ...@@ -674,7 +674,7 @@ void ProfileHelperImpl::OnSessionRestoreStateChanged(
chromeos::OAuth2LoginManagerFactory::GetInstance()->GetForProfile( chromeos::OAuth2LoginManagerFactory::GetInstance()->GetForProfile(
user_profile); user_profile);
login_manager->RemoveObserver(this); login_manager->RemoveObserver(this);
ClearSigninProfile(base::Closure()); ClearSigninProfile(base::OnceClosure());
} }
} }
...@@ -718,7 +718,7 @@ void ProfileHelperImpl::FlushProfile(Profile* profile) { ...@@ -718,7 +718,7 @@ void ProfileHelperImpl::FlushProfile(Profile* profile) {
// Flushes files directly under profile path since these are the critical // Flushes files directly under profile path since these are the critical
// ones. // ones.
profile_flusher_->RequestFlush(profile->GetPath(), /*recursive=*/false, profile_flusher_->RequestFlush(profile->GetPath(), /*recursive=*/false,
base::Closure()); base::OnceClosure());
} }
} // namespace chromeos } // namespace chromeos
...@@ -133,7 +133,7 @@ class ProfileHelper ...@@ -133,7 +133,7 @@ class ProfileHelper
// Clears site data (cookies, history, etc) for signin profile. // Clears site data (cookies, history, etc) for signin profile.
// Callback can be empty. Not thread-safe. // Callback can be empty. Not thread-safe.
virtual void ClearSigninProfile(const base::Closure& on_clear_callback) = 0; virtual void ClearSigninProfile(base::OnceClosure on_clear_callback) = 0;
// Returns profile of the user associated with |account_id| if it is created // Returns profile of the user associated with |account_id| if it is created
// and fully initialized. Otherwise, returns NULL. // and fully initialized. Otherwise, returns NULL.
......
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