Migrating base:Bind to BindOnce and BindRepeating.

We use base::RepeatingClosure and base::Bindepeating for
attempt_user_exit_callback_. In other locations we convert Bind
to BindOnce, because callers require OnceCallback.

BUG=764795
TESTED=build

Change-Id: I35172b00c4ccb37383b2adb55d44e8569b129dbf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2483547Reviewed-by: Hidehiko Abe <hidehiko@chromium.org>
Commit-Queue: Tomasz Tylenda <ttylenda@chromium.org>
Cr-Commit-Position: refs/heads/master@{#818377}

chrome/browser/chromeos/arc/session/arc_session_manager.cc

@@ -447,7 +447,7 @@ ArcSessionManager::ArcSessionManager(
     : arc_session_runner_(std::move(arc_session_runner)),
       adb_sideloading_availability_delegate_(
           std::move(adb_sideloading_availability_delegate)),
-      attempt_user_exit_callback_(base::Bind(chrome::AttemptUserExit)),
+      attempt_user_exit_callback_(base::BindRepeating(chrome::AttemptUserExit)),
       property_files_source_dir_(base::FilePath(
           IsArcVmEnabled() ? kPropertyFilesPathVm : kPropertyFilesPath)),
       property_files_dest_dir_(
@@ -1208,8 +1208,8 @@ void ArcSessionManager::MaybeStartTermsOfServiceNegotiation() {
   arc_session_runner_->RequestStartMiniInstance();
 
   terms_of_service_negotiator_->StartNegotiation(
-      base::Bind(&ArcSessionManager::OnTermsOfServiceNegotiated,
-                 weak_ptr_factory_.GetWeakPtr()));
+      base::BindOnce(&ArcSessionManager::OnTermsOfServiceNegotiated,
+                     weak_ptr_factory_.GetWeakPtr()));
 }
 
 void ArcSessionManager::OnTermsOfServiceNegotiated(bool accepted) {
@@ -1266,8 +1266,8 @@ void ArcSessionManager::StartAndroidManagementCheck() {
   android_management_checker_ = std::make_unique<ArcAndroidManagementChecker>(
       profile_, false /* retry_on_error */);
   android_management_checker_->StartCheck(
-      base::Bind(&ArcSessionManager::OnAndroidManagementChecked,
-                 weak_ptr_factory_.GetWeakPtr()));
+      base::BindOnce(&ArcSessionManager::OnAndroidManagementChecked,
+                     weak_ptr_factory_.GetWeakPtr()));
 }
 
 void ArcSessionManager::OnAndroidManagementChecked(
@@ -1316,8 +1316,8 @@ void ArcSessionManager::StartBackgroundAndroidManagementCheck() {
   android_management_checker_ = std::make_unique<ArcAndroidManagementChecker>(
       profile_, true /* retry_on_error */);
   android_management_checker_->StartCheck(
-      base::Bind(&ArcSessionManager::OnBackgroundAndroidManagementChecked,
-                 weak_ptr_factory_.GetWeakPtr()));
+      base::BindOnce(&ArcSessionManager::OnBackgroundAndroidManagementChecked,
+                     weak_ptr_factory_.GetWeakPtr()));
 }
 
 void ArcSessionManager::OnBackgroundAndroidManagementChecked(
@@ -1546,7 +1546,7 @@ ArcSessionRunner* ArcSessionManager::GetArcSessionRunnerForTesting() {
 }
 
 void ArcSessionManager::SetAttemptUserExitCallbackForTesting(
-    const base::Closure& callback) {
+    const base::RepeatingClosure& callback) {
   DCHECK(!callback.is_null());
   attempt_user_exit_callback_ = callback;
 }

chrome/browser/chromeos/arc/session/arc_session_manager.h

@@ -250,7 +250,8 @@ class ArcSessionManager : public ArcSessionRunner::Observer,
   void SetArcSessionRunnerForTesting(
       std::unique_ptr<ArcSessionRunner> arc_session_runner);
   ArcSessionRunner* GetArcSessionRunnerForTesting();
-  void SetAttemptUserExitCallbackForTesting(const base::Closure& callback);
+  void SetAttemptUserExitCallbackForTesting(
+      const base::RepeatingClosure& callback);
 
   // Returns whether the Play Store app is requested to be launched by this
   // class. Should be used only for tests.
@@ -418,7 +419,7 @@ class ArcSessionManager : public ArcSessionRunner::Observer,
   base::TimeTicks sign_in_start_time_;
   // The time when ARC was about to start.
   base::TimeTicks arc_start_time_;
-  base::Closure attempt_user_exit_callback_;
+  base::RepeatingClosure attempt_user_exit_callback_;
 
   ArcAppIdProviderImpl app_id_provider_;
 

chrome/browser/chromeos/arc/session/arc_session_manager_unittest.cc

@@ -1282,7 +1282,8 @@ TEST_F(ArcSessionManagerKioskTest, AuthFailure) {
   // and not invoked then, including TearDown().
   bool terminated = false;
   arc_session_manager()->SetAttemptUserExitCallbackForTesting(
-      base::Bind([](bool* terminated) { *terminated = true; }, &terminated));
+      base::BindRepeating([](bool* terminated) { *terminated = true; },
+                          &terminated));
 
   arc_session_manager()->OnProvisioningFinished(
       ProvisioningResult::CHROME_SERVER_COMMUNICATION_ERROR, nullptr);