Revert "Migrate base::Callback to base::OnceCallback."

This reverts commit a0282608.

Reason for revert: b/169804713 

Original change's description:
> Migrate base::Callback to base::OnceCallback.
>
> BUG=764795
> TEST=build
>
> Change-Id: I8afa2fd87eb5cf5d9a8f7ecde9fad95d420c5399
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2434405
> Reviewed-by: Hidehiko Abe <hidehiko@chromium.org>
> Commit-Queue: Tomasz Tylenda <ttylenda@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#811980}

TBR=hidehiko@chromium.org,ttylenda@chromium.org

Change-Id: I7de1e3dac102f4c760aef90da690016b020baa3f
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 764795
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2440088Reviewed-by: Hidehiko Abe <hidehiko@chromium.org>
Commit-Queue: Tomasz Tylenda <ttylenda@chromium.org>
Cr-Commit-Position: refs/heads/master@{#812516}

chrome/browser/chromeos/arc/auth/arc_auth_context.cc

@@ -37,13 +37,13 @@ ArcAuthContext::~ArcAuthContext() {
   identity_manager_->RemoveObserver(this);
 }
 
-void ArcAuthContext::Prepare(PrepareCallback callback) {
+void ArcAuthContext::Prepare(const PrepareCallback& callback) {
   if (context_prepared_) {
-    std::move(callback).Run(true);
+    callback.Run(true);
     return;
   }
 
-  callback_ = std::move(callback);
+  callback_ = callback;
   identity_manager_->RemoveObserver(this);
   refresh_token_timeout_.Stop();
 

chrome/browser/chromeos/arc/auth/arc_auth_context.h

@@ -31,8 +31,8 @@ class ArcAuthContext : public signin::IdentityManager::Observer {
   // cancel the inflight operation.
   // On completion, |true| is passed to the callback. On error, |false|
   // is passed.
-  using PrepareCallback = base::OnceCallback<void(bool success)>;
-  void Prepare(PrepareCallback callback);
+  using PrepareCallback = base::Callback<void(bool success)>;
+  void Prepare(const PrepareCallback& callback);
 
   // Creates and starts a request to fetch an access token for the given
   // |scopes|. The caller owns the returned request. |callback| will be

chrome/browser/chromeos/arc/bluetooth/arc_bluetooth_bridge.cc

@@ -2247,23 +2247,21 @@ void ArcBluetoothBridge::EnableAdvertisementImpl(
       base::Bind(&ArcBluetoothBridge::OnReadyToRegisterAdvertisement,
                  weak_factory_.GetWeakPtr(), repeating_callback, adv_handle,
                  base::Passed(std::move(advertisement)));
-  base::OnceCallback<void(BluetoothAdvertisement::ErrorCode)> error_callback =
-      base::BindOnce(&ArcBluetoothBridge::OnRegisterAdvertisementError,
-                     weak_factory_.GetWeakPtr(), repeating_callback,
-                     adv_handle);
+  base::Callback<void(BluetoothAdvertisement::ErrorCode)> error_callback =
+      base::Bind(&ArcBluetoothBridge::OnRegisterAdvertisementError,
+                 weak_factory_.GetWeakPtr(), repeating_callback, adv_handle);
 
   auto it = advertisements_.find(adv_handle);
   if (it == advertisements_.end()) {
-    std::move(error_callback)
-        .Run(BluetoothAdvertisement::ErrorCode::
-                 ERROR_ADVERTISEMENT_DOES_NOT_EXIST);
+    error_callback.Run(
+        BluetoothAdvertisement::ErrorCode::ERROR_ADVERTISEMENT_DOES_NOT_EXIST);
     return;
   }
   if (it->second == nullptr) {
-    std::move(done_callback).Run();
+    done_callback.Run();
     return;
   }
-  it->second->Unregister(done_callback, std::move(error_callback));
+  it->second->Unregister(done_callback, error_callback);
 }
 
 void ArcBluetoothBridge::DisableAdvertisement(
@@ -2286,23 +2284,21 @@ void ArcBluetoothBridge::DisableAdvertisementImpl(
   base::Closure done_callback =
       base::Bind(&ArcBluetoothBridge::OnUnregisterAdvertisementDone,
                  weak_factory_.GetWeakPtr(), repeating_callback, adv_handle);
-  base::OnceCallback<void(BluetoothAdvertisement::ErrorCode)> error_callback =
-      base::BindOnce(&ArcBluetoothBridge::OnUnregisterAdvertisementError,
-                     weak_factory_.GetWeakPtr(), repeating_callback,
-                     adv_handle);
+  base::Callback<void(BluetoothAdvertisement::ErrorCode)> error_callback =
+      base::Bind(&ArcBluetoothBridge::OnUnregisterAdvertisementError,
+                 weak_factory_.GetWeakPtr(), repeating_callback, adv_handle);
 
   auto it = advertisements_.find(adv_handle);
   if (it == advertisements_.end()) {
-    std::move(error_callback)
-        .Run(BluetoothAdvertisement::ErrorCode::
-                 ERROR_ADVERTISEMENT_DOES_NOT_EXIST);
+    error_callback.Run(
+        BluetoothAdvertisement::ErrorCode::ERROR_ADVERTISEMENT_DOES_NOT_EXIST);
     return;
   }
   if (it->second == nullptr) {
     done_callback.Run();
     return;
   }
-  it->second->Unregister(done_callback, std::move(error_callback));
+  it->second->Unregister(done_callback, error_callback);
 }
 
 void ArcBluetoothBridge::ReleaseAdvertisementHandle(

chrome/browser/chromeos/arc/file_system_watcher/arc_file_system_watcher_service.cc

@@ -174,10 +174,9 @@ class ArcFileSystemWatcherServiceFactory
 // directory.
 class ArcFileSystemWatcherService::FileSystemWatcher {
  public:
-  using Callback =
-      base::OnceCallback<void(const std::vector<std::string>& paths)>;
+  using Callback = base::Callback<void(const std::vector<std::string>& paths)>;
 
-  FileSystemWatcher(Callback callback,
+  FileSystemWatcher(const Callback& callback,
                     const base::FilePath& cros_dir,
                     const base::FilePath& android_dir);
   ~FileSystemWatcher();
@@ -220,10 +219,10 @@ class ArcFileSystemWatcherService::FileSystemWatcher {
 };
 
 ArcFileSystemWatcherService::FileSystemWatcher::FileSystemWatcher(
-    Callback callback,
+    const Callback& callback,
     const base::FilePath& cros_dir,
     const base::FilePath& android_dir)
-    : callback_(std::move(callback)),
+    : callback_(callback),
       cros_dir_(cros_dir),
       android_dir_(android_dir),
       last_notify_time_(base::TimeTicks()),
@@ -296,7 +295,7 @@ void ArcFileSystemWatcherService::FileSystemWatcher::OnBuildTimestampMap(
     string_paths[i] = changed_paths[i].value();
   }
   content::GetUIThreadTaskRunner({})->PostTask(
-      FROM_HERE, base::BindOnce(std::move(callback_), std::move(string_paths)));
+      FROM_HERE, base::BindOnce(callback_, std::move(string_paths)));
   if (last_notify_time_ > snapshot_time)
     DelayBuildTimestampMap();
   else

chrome/browser/chromeos/arc/optin/arc_terms_of_service_negotiator.cc

@@ -13,9 +13,9 @@ ArcTermsOfServiceNegotiator::ArcTermsOfServiceNegotiator() = default;
 ArcTermsOfServiceNegotiator::~ArcTermsOfServiceNegotiator() = default;
 
 void ArcTermsOfServiceNegotiator::StartNegotiation(
-    NegotiationCallback callback) {
+    const NegotiationCallback& callback) {
   DCHECK(pending_callback_.is_null());
-  pending_callback_ = std::move(callback);
+  pending_callback_ = callback;
   StartNegotiationImpl();
 }
 

chrome/browser/chromeos/arc/optin/arc_terms_of_service_negotiator.h

@@ -20,8 +20,8 @@ class ArcTermsOfServiceNegotiator {
   // accepts ToS. If user explicitly rejects ToS, invokes |callback| with
   // |accepted| = false. Deleting this instance cancels the operation, so
   // |callback| will never be invoked then.
-  using NegotiationCallback = base::OnceCallback<void(bool accepted)>;
-  void StartNegotiation(NegotiationCallback callback);
+  using NegotiationCallback = base::Callback<void(bool accepted)>;
+  void StartNegotiation(const NegotiationCallback& callback);
 
  protected:
   // Reports result of negotiation via callback and then resets it. If

chrome/browser/chromeos/arc/policy/arc_android_management_checker.cc

@@ -70,7 +70,7 @@ void ArcAndroidManagementChecker::StartClient() {
   GetDeviceManagementService()->ScheduleInitialization(0);
 }
 
-void ArcAndroidManagementChecker::StartCheck(CheckCallback callback) {
+void ArcAndroidManagementChecker::StartCheck(const CheckCallback& callback) {
   DCHECK(callback_.is_null());
 
   // Do not send requests for Chrome OS managed users, nor for well-known
@@ -78,11 +78,11 @@ void ArcAndroidManagementChecker::StartCheck(CheckCallback callback) {
   if (policy_util::IsAccountManaged(profile_) ||
       policy::BrowserPolicyConnector::IsNonEnterpriseUser(
           profile_->GetProfileUserName())) {
-    std::move(callback).Run(policy::AndroidManagementClient::Result::UNMANAGED);
+    callback.Run(policy::AndroidManagementClient::Result::UNMANAGED);
     return;
   }
 
-  callback_ = std::move(callback);
+  callback_ = callback;
   EnsureRefreshTokenLoaded();
 }
 

chrome/browser/chromeos/arc/policy/arc_android_management_checker.h

@@ -30,8 +30,8 @@ class ArcAndroidManagementChecker : public signin::IdentityManager::Observer {
   // If the instance is destructed while it has inflight check, then the
   // check will be cancelled and |callback| will not be called.
   using CheckCallback =
-      base::OnceCallback<void(policy::AndroidManagementClient::Result result)>;
-  void StartCheck(CheckCallback callback);
+      base::Callback<void(policy::AndroidManagementClient::Result result)>;
+  void StartCheck(const CheckCallback& callback);
 
  private:
   void StartCheckInternal();