[CrOS MultiDevice] Provide host name to 'Chromebook added' notification

The new strings for settings (added in
https://chromium-review.googlesource.com/c/chromium/src/+/1252915)
include a notification title that contains the host device name. This
CL provides it as an argument to
MultiDeviceNotificationPresenter::OnNewChromebookAddedForExistingUser
and updates the references to that function. Several of these are for
tests (unit and manual).

Screenshot of the new notification: http://screen/fzqJUOtSgHV

Bug: 890521
Change-Id: If3586ea526866530a35b35d80957c57d3c83fe5c
Reviewed-on: https://chromium-review.googlesource.com/c/1252338
Commit-Queue: Jordy Greenblatt <jordynass@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Reviewed-by: James Cook <jamescook@chromium.org>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#596058}

ash/multi_device_setup/multi_device_notification_presenter.cc

@@ -121,16 +121,18 @@ void MultiDeviceNotificationPresenter::OnConnectedHostSwitchedForExistingUser(
     const std::string& new_host_device_name) {
   base::string16 title = l10n_util::GetStringFUTF16(
       IDS_ASH_MULTI_DEVICE_SETUP_EXISTING_USER_HOST_SWITCHED_TITLE,
-      base::UTF8ToUTF16(new_host_device_name));
+      base::ASCIIToUTF16(new_host_device_name));
   base::string16 message = l10n_util::GetStringUTF16(
       IDS_ASH_MULTI_DEVICE_SETUP_EXISTING_USER_HOST_SWITCHED_MESSAGE);
   ShowNotification(Status::kExistingUserHostSwitchedNotificationVisible, title,
                    message);
 }
 
-void MultiDeviceNotificationPresenter::OnNewChromebookAddedForExistingUser() {
-  base::string16 title = l10n_util::GetStringUTF16(
-      IDS_ASH_MULTI_DEVICE_SETUP_EXISTING_USER_NEW_CHROMEBOOK_ADDED_TITLE);
+void MultiDeviceNotificationPresenter::OnNewChromebookAddedForExistingUser(
+    const std::string& new_host_device_name) {
+  base::string16 title = l10n_util::GetStringFUTF16(
+      IDS_ASH_MULTI_DEVICE_SETUP_EXISTING_USER_NEW_CHROMEBOOK_ADDED_TITLE,
+      base::ASCIIToUTF16(new_host_device_name));
   base::string16 message = l10n_util::GetStringUTF16(
       IDS_ASH_MULTI_DEVICE_SETUP_EXISTING_USER_NEW_CHROMEBOOK_ADDED_MESSAGE);
   ShowNotification(Status::kExistingUserNewChromebookNotificationVisible, title,

ash/multi_device_setup/multi_device_notification_presenter.h

@@ -61,7 +61,8 @@ class ASH_EXPORT MultiDeviceNotificationPresenter
   void OnPotentialHostExistsForNewUser() override;
   void OnConnectedHostSwitchedForExistingUser(
       const std::string& new_host_device_name) override;
-  void OnNewChromebookAddedForExistingUser() override;
+  void OnNewChromebookAddedForExistingUser(
+      const std::string& new_host_device_name) override;
 
   // SessionObserver:
   void OnUserSessionAdded(const AccountId& account_id) override;

ash/multi_device_setup/multi_device_notification_presenter_unittest.cc

@@ -184,7 +184,8 @@ class MultiDeviceNotificationPresenterTest : public NoSessionAshTestBase {
 
   void ShowExistingUserNewChromebookNotification() {
     EXPECT_TRUE(fake_multidevice_setup_->delegate().is_bound());
-    fake_multidevice_setup_->delegate()->OnNewChromebookAddedForExistingUser();
+    fake_multidevice_setup_->delegate()->OnNewChromebookAddedForExistingUser(
+        kTestHostDeviceName);
     InvokePendingMojoCalls();
   }
 
@@ -285,8 +286,9 @@ class MultiDeviceNotificationPresenterTest : public NoSessionAshTestBase {
         break;
       case MultiDeviceNotificationPresenter::Status::
           kExistingUserNewChromebookNotificationVisible:
-        title = l10n_util::GetStringUTF16(
-            IDS_ASH_MULTI_DEVICE_SETUP_EXISTING_USER_NEW_CHROMEBOOK_ADDED_TITLE);
+        title = l10n_util::GetStringFUTF16(
+            IDS_ASH_MULTI_DEVICE_SETUP_EXISTING_USER_NEW_CHROMEBOOK_ADDED_TITLE,
+            base::ASCIIToUTF16(kTestHostDeviceName));
         message = l10n_util::GetStringUTF16(
             IDS_ASH_MULTI_DEVICE_SETUP_EXISTING_USER_NEW_CHROMEBOOK_ADDED_MESSAGE);
         break;

chromeos/services/multidevice_setup/account_status_change_delegate_notifier_impl.cc

@@ -156,7 +156,8 @@ void AccountStatusChangeDelegateNotifierImpl::CheckForMultiDeviceEvents(
   CheckForNewUserPotentialHostExistsEvent(host_status_with_device);
   CheckForExistingUserHostSwitchedEvent(host_status_with_device,
                                         host_device_id_before_update);
-  CheckForExistingUserChromebookAddedEvent(host_device_id_before_update);
+  CheckForExistingUserChromebookAddedEvent(host_status_with_device,
+                                           host_device_id_before_update);
 }
 
 void AccountStatusChangeDelegateNotifierImpl::
@@ -207,6 +208,7 @@ void AccountStatusChangeDelegateNotifierImpl::
 
 void AccountStatusChangeDelegateNotifierImpl::
     CheckForExistingUserChromebookAddedEvent(
+        const HostStatusProvider::HostStatusWithDevice& host_status_with_device,
         const base::Optional<std::string>& host_device_id_before_update) {
   // The Chromebook added event requires that a set host was found by the
   // update, i.e. there was no host before the host status update but afterward
@@ -214,7 +216,8 @@ void AccountStatusChangeDelegateNotifierImpl::
   if (!host_device_id_from_most_recent_update_ || host_device_id_before_update)
     return;
 
-  delegate()->OnNewChromebookAddedForExistingUser();
+  delegate()->OnNewChromebookAddedForExistingUser(
+      host_status_with_device.host_device()->name());
   pref_service_->SetInt64(kExistingUserChromebookAddedPrefName,
                           clock_->Now().ToJavaTime());
 }

chromeos/services/multidevice_setup/account_status_change_delegate_notifier_impl.h

@@ -86,6 +86,7 @@ class AccountStatusChangeDelegateNotifierImpl
       const HostStatusProvider::HostStatusWithDevice& host_status_with_device,
       const base::Optional<std::string>& host_device_id_before_update);
   void CheckForExistingUserChromebookAddedEvent(
+      const HostStatusProvider::HostStatusWithDevice& host_status_with_device,
       const base::Optional<std::string>& host_device_id_before_update);
 
   // Loads data from previous session using PrefService.

chromeos/services/multidevice_setup/fake_account_status_change_delegate.cc

@@ -28,7 +28,8 @@ void FakeAccountStatusChangeDelegate::OnConnectedHostSwitchedForExistingUser(
   ++num_existing_user_host_switched_events_handled_;
 }
 
-void FakeAccountStatusChangeDelegate::OnNewChromebookAddedForExistingUser() {
+void FakeAccountStatusChangeDelegate::OnNewChromebookAddedForExistingUser(
+    const std::string& new_host_device_name) {
   ++num_existing_user_chromebook_added_events_handled_;
 }
 

chromeos/services/multidevice_setup/fake_account_status_change_delegate.h

@@ -36,7 +36,8 @@ class FakeAccountStatusChangeDelegate
   void OnPotentialHostExistsForNewUser() override;
   void OnConnectedHostSwitchedForExistingUser(
       const std::string& new_host_device_name) override;
-  void OnNewChromebookAddedForExistingUser() override;
+  void OnNewChromebookAddedForExistingUser(
+      const std::string& new_host_device_name) override;
 
  private:
   size_t num_new_user_events_handled_ = 0u;

chromeos/services/multidevice_setup/multidevice_setup_impl.cc

@@ -251,7 +251,8 @@ void MultiDeviceSetupImpl::TriggerEventForDebugging(
           kTestDeviceNameForDebugNotification);
       break;
     case mojom::EventTypeForDebugging::kExistingUserNewChromebookAdded:
-      delegate->OnNewChromebookAddedForExistingUser();
+      delegate->OnNewChromebookAddedForExistingUser(
+          kTestDeviceNameForDebugNotification);
       break;
     default:
       NOTREACHED();

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

@@ -94,14 +94,13 @@ interface AccountStatusChangeDelegate {
   // Callback which indicates that the currently-connected MultiDevice host has
   // changed. This likely means that the user has changed MultiDevice settings
   // on another device. This function is only called if the current user has
-  // already set up MultiDevice features. Note: |new_host_device_name| is
-  // expected to be a UTF-8 string.
+  // already set up MultiDevice features.
   OnConnectedHostSwitchedForExistingUser(string new_host_device_name);
 
   // Callback which indicates that a new Chromebook was added to the account of
   // the current user. This function is only called if the current user has
   // already set up MultiDevice features.
-  OnNewChromebookAddedForExistingUser();
+  OnNewChromebookAddedForExistingUser(string new_host_device_name);
 };
 
 interface HostStatusObserver {