[CrOS MultiDevice] Remove unnecessary callback from Mojo function.

The SetAccountStatusChangeDelegate() function previously fired a
callback after the delegate was set, but that was unnecessary. All of
the clients of the function simply passed base::DoNothing() anyway.

This CL removes that unnecessary callback.

Bug: 824568
Change-Id: Iea3e6e0c85eedb6e3cfcb0147b81e433cc5babac
Reviewed-on: https://chromium-review.googlesource.com/1110600
Commit-Queue: Kyle Horimoto <khorimoto@chromium.org>
Reviewed-by: Dan Erat <derat@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#569765}

ash/multi_device_setup/multi_device_notification_presenter.cc

@@ -190,7 +190,7 @@ void MultiDeviceNotificationPresenter::ObserveMultiDeviceSetupIfPossible() {
       delegate_ptr;
   binding_.Bind(mojo::MakeRequest(&delegate_ptr));
   multidevice_setup_ptr_->SetAccountStatusChangeDelegate(
-      std::move(delegate_ptr), base::DoNothing());
+      std::move(delegate_ptr));
 }
 
 void MultiDeviceNotificationPresenter::OnNotificationClicked() {

ash/multi_device_setup/multi_device_notification_presenter_unittest.cc

@@ -101,10 +101,8 @@ class FakeMultiDeviceSetup
   // mojom::MultiDeviceSetup:
   void SetAccountStatusChangeDelegate(
       chromeos::multidevice_setup::mojom::AccountStatusChangeDelegatePtr
-          delegate,
-      SetAccountStatusChangeDelegateCallback callback) override {
+          delegate) override {
     delegate_ = std::move(delegate);
-    std::move(callback).Run();
   }
 
   void TriggerEventForDebugging(

chromeos/services/multidevice_setup/fake_multidevice_setup.cc

@@ -13,10 +13,8 @@ FakeMultiDeviceSetup::FakeMultiDeviceSetup() = default;
 FakeMultiDeviceSetup::~FakeMultiDeviceSetup() = default;
 
 void FakeMultiDeviceSetup::SetAccountStatusChangeDelegate(
-    mojom::AccountStatusChangeDelegatePtr delegate,
-    SetAccountStatusChangeDelegateCallback callback) {
+    mojom::AccountStatusChangeDelegatePtr delegate) {
   delegate_ = std::move(delegate);
-  std::move(callback).Run();
 }
 
 void FakeMultiDeviceSetup::TriggerEventForDebugging(

chromeos/services/multidevice_setup/fake_multidevice_setup.h

@@ -31,8 +31,7 @@ class FakeMultiDeviceSetup : public mojom::MultiDeviceSetup {
  private:
   // mojom::MultiDeviceSetup:
   void SetAccountStatusChangeDelegate(
-      mojom::AccountStatusChangeDelegatePtr delegate,
-      SetAccountStatusChangeDelegateCallback callback) override;
+      mojom::AccountStatusChangeDelegatePtr delegate) override;
   void TriggerEventForDebugging(
       mojom::EventTypeForDebugging type,
       TriggerEventForDebuggingCallback callback) override;

chromeos/services/multidevice_setup/multidevice_setup_impl.cc

@@ -63,10 +63,8 @@ MultiDeviceSetupImpl::MultiDeviceSetupImpl(
 MultiDeviceSetupImpl::~MultiDeviceSetupImpl() = default;
 
 void MultiDeviceSetupImpl::SetAccountStatusChangeDelegate(
-    mojom::AccountStatusChangeDelegatePtr delegate,
-    SetAccountStatusChangeDelegateCallback callback) {
+    mojom::AccountStatusChangeDelegatePtr delegate) {
   delegate_notifier_->SetAccountStatusChangeDelegatePtr(std::move(delegate));
-  std::move(callback).Run();
 }
 
 void MultiDeviceSetupImpl::TriggerEventForDebugging(

chromeos/services/multidevice_setup/multidevice_setup_impl.h

@@ -54,8 +54,7 @@ class MultiDeviceSetupImpl : public mojom::MultiDeviceSetup {
 
   // mojom::MultiDeviceSetup:
   void SetAccountStatusChangeDelegate(
-      mojom::AccountStatusChangeDelegatePtr delegate,
-      SetAccountStatusChangeDelegateCallback callback) override;
+      mojom::AccountStatusChangeDelegatePtr delegate) override;
   void TriggerEventForDebugging(
       mojom::EventTypeForDebugging type,
       TriggerEventForDebuggingCallback callback) override;

chromeos/services/multidevice_setup/multidevice_setup_impl_unittest.cc

@@ -149,8 +149,7 @@ class MultiDeviceSetupImplTest : public testing::Test {
 
     EXPECT_FALSE(fake_account_status_change_delegate_notifier()->delegate());
     multidevice_setup_->SetAccountStatusChangeDelegate(
-        fake_account_status_change_delegate_->GenerateInterfacePtr(),
-        base::DoNothing());
+        fake_account_status_change_delegate_->GenerateInterfacePtr());
     EXPECT_TRUE(fake_account_status_change_delegate_notifier()->delegate());
   }
 

chromeos/services/multidevice_setup/multidevice_setup_initializer.cc

@@ -63,11 +63,10 @@ MultiDeviceSetupInitializer::MultiDeviceSetupInitializer(
 MultiDeviceSetupInitializer::~MultiDeviceSetupInitializer() = default;
 
 void MultiDeviceSetupInitializer::SetAccountStatusChangeDelegate(
-    mojom::AccountStatusChangeDelegatePtr delegate,
-    SetAccountStatusChangeDelegateCallback callback) {
+    mojom::AccountStatusChangeDelegatePtr delegate) {
   if (multidevice_setup_impl_) {
     multidevice_setup_impl_->SetAccountStatusChangeDelegate(
-        std::move(delegate), std::move(callback));
+        std::move(delegate));
     return;
   }
 
@@ -76,8 +75,6 @@ void MultiDeviceSetupInitializer::SetAccountStatusChangeDelegate(
                << "service was initialized; will be set once initialization is "
                << "complete.";
   pending_delegate_ = std::move(delegate);
-
-  std::move(callback).Run();
 }
 
 void MultiDeviceSetupInitializer::TriggerEventForDebugging(
@@ -111,7 +108,7 @@ void MultiDeviceSetupInitializer::InitializeImplementation() {
     return;
 
   multidevice_setup_impl_->SetAccountStatusChangeDelegate(
-      std::move(pending_delegate_), base::DoNothing());
+      std::move(pending_delegate_));
 }
 
 }  // namespace multidevice_setup

chromeos/services/multidevice_setup/multidevice_setup_initializer.h

@@ -51,8 +51,7 @@ class MultiDeviceSetupInitializer
 
   // mojom::MultiDeviceSetup:
   void SetAccountStatusChangeDelegate(
-      mojom::AccountStatusChangeDelegatePtr delegate,
-      SetAccountStatusChangeDelegateCallback callback) override;
+      mojom::AccountStatusChangeDelegatePtr delegate) override;
   void TriggerEventForDebugging(
       mojom::EventTypeForDebugging type,
       TriggerEventForDebuggingCallback callback) override;

chromeos/services/multidevice_setup/multidevice_setup_service_unittest.cc

@@ -110,8 +110,7 @@ class MultiDeviceSetupServiceTest : public testing::Test {
         std::make_unique<FakeAccountStatusChangeDelegate>();
 
     multidevice_setup_ptr_->SetAccountStatusChangeDelegate(
-        fake_account_status_change_delegate_->GenerateInterfacePtr(),
-        base::DoNothing());
+        fake_account_status_change_delegate_->GenerateInterfacePtr());
     multidevice_setup_ptr_.FlushForTesting();
   }
 

chromeos/services/multidevice_setup/public/mojom/multidevice_setup.mojom

@@ -39,7 +39,7 @@ interface MultiDeviceSetup {
   // Registers the "account status change" delegate to be used by the service.
   // Only one delegate can be set; this function should not be called more than
   // once.
-  SetAccountStatusChangeDelegate(AccountStatusChangeDelegate delegate) => ();
+  SetAccountStatusChangeDelegate(AccountStatusChangeDelegate delegate);
 
   // Triggers an event to be dispatched by the service. This API function is
   // intended to be used only for debugging in the chrome://proximity-auth page.