glanceables: Refactor SystemTrayClient::RequestRestartForUpdate()

Move the method to SessionControllerClient. This consolidates more of
the signout/restart logic in SessionControllerClient.

For glanceables we're experimenting with taking a screenshot of open
windows during signout/restart/shutdown. This consolidation means
there are will be fewer classes to modify to take the screenshot.

Bug: 1357058
Test: updated ash_unittests
Change-Id: I55b210f355c44ca142f51929816a5f65dcb615e5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3868795
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Commit-Queue: James Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1042342}

ash/public/cpp/session/session_controller_client.h

@@ -26,6 +26,9 @@ class ASH_PUBLIC_EXPORT SessionControllerClient {
   // Requests signing out all users, ending the current session.
   virtual void RequestSignOut() = 0;
 
+  // Requests to restart the system for OS update.
+  virtual void RequestRestartForUpdate() = 0;
+
   // Attempts to restart the chrome browser.
   virtual void AttemptRestartChrome() = 0;
 

ash/public/cpp/system_tray_client.h

@@ -136,9 +136,6 @@ class ASH_PUBLIC_EXPORT SystemTrayClient {
   // Shows the Firmware update app.
   virtual void ShowFirmwareUpdate() = 0;
 
-  // Attempts to restart the system for update.
-  virtual void RequestRestartForUpdate() = 0;
-
   // Sets the UI locale to |locale_iso_code| and exit the session to take
   // effect.
   virtual void SetLocaleAndExit(const std::string& locale_iso_code) = 0;

ash/public/cpp/test/test_system_tray_client.cc

@@ -108,8 +108,6 @@ void TestSystemTrayClient::ShowFirmwareUpdate() {
   show_firmware_update_count_++;
 }
 
-void TestSystemTrayClient::RequestRestartForUpdate() {}
-
 void TestSystemTrayClient::SetLocaleAndExit(
     const std::string& locale_iso_code) {}
 

ash/public/cpp/test/test_system_tray_client.h

@@ -59,7 +59,6 @@ class ASH_PUBLIC_EXPORT TestSystemTrayClient : public SystemTrayClient {
   void ShowNetworkSettings(const std::string& network_id) override;
   void ShowMultiDeviceSetup() override;
   void ShowFirmwareUpdate() override;
-  void RequestRestartForUpdate() override;
   void SetLocaleAndExit(const std::string& locale_iso_code) override;
   void ShowAccessCodeCastingDialog(
       AccessCodeCastDialogOpenLocation open_location) override;

ash/session/session_controller_impl.cc

@@ -237,6 +237,11 @@ void SessionControllerImpl::ProceedWithSignOut() {
     client_->RequestSignOut();
 }
 
+void SessionControllerImpl::RequestRestartForUpdate() {
+  if (client_)
+    client_->RequestRestartForUpdate();
+}
+
 void SessionControllerImpl::AttemptRestartChrome() {
   if (client_)
     client_->AttemptRestartChrome();

ash/session/session_controller_impl.h

@@ -149,6 +149,9 @@ class ASH_EXPORT SessionControllerImpl : public SessionController {
   // should use LockStateController::RequestSignOut() instead.
   void RequestSignOut();
 
+  // Requests a system restart to apply an OS update.
+  void RequestRestartForUpdate();
+
   // Attempts to restart the chrome browser.
   void AttemptRestartChrome();
 

ash/session/test_session_controller_client.cc

@@ -236,6 +236,10 @@ void TestSessionControllerClient::RequestSignOut() {
   ++request_sign_out_count_;
 }
 
+void TestSessionControllerClient::RequestRestartForUpdate() {
+  ++request_restart_for_update_count_;
+}
+
 void TestSessionControllerClient::AttemptRestartChrome() {
   ++attempt_restart_chrome_count_;
 }

ash/session/test_session_controller_client.h

@@ -63,6 +63,9 @@ class TestSessionControllerClient : public SessionControllerClient {
     return attempt_restart_chrome_count_;
   }
   int request_sign_out_count() const { return request_sign_out_count_; }
+  int request_restart_for_update_count() const {
+    return request_restart_for_update_count_;
+  }
 
   // Helpers to set SessionController state.
   void SetCanLockScreen(bool can_lock);
@@ -129,6 +132,7 @@ class TestSessionControllerClient : public SessionControllerClient {
   void RequestLockScreen() override;
   void RequestHideLockScreen() override;
   void RequestSignOut() override;
+  void RequestRestartForUpdate() override;
   void AttemptRestartChrome() override;
   void SwitchActiveUser(const AccountId& account_id) override;
   void CycleActiveUser(CycleUserDirection direction) override;
@@ -160,6 +164,7 @@ class TestSessionControllerClient : public SessionControllerClient {
 
   bool use_lower_case_user_id_ = true;
   int request_sign_out_count_ = 0;
+  int request_restart_for_update_count_ = 0;
   int attempt_restart_chrome_count_ = 0;
 
   bool should_show_lock_screen_ = false;

ash/system/update/update_notification_controller.cc

@@ -292,7 +292,7 @@ void UpdateNotificationController::RestartForUpdate() {
     return;
   }
   // System updates require restarting the device.
-  Shell::Get()->system_tray_model()->client()->RequestRestartForUpdate();
+  Shell::Get()->session_controller()->RequestRestartForUpdate();
   base::RecordAction(
       base::UserMetricsAction("StatusArea_OS_Update_Default_Selected"));
 }

ash/system/update/update_notification_controller_unittest.cc

@@ -169,6 +169,14 @@ TEST_F(UpdateNotificationControllerTest, VisibilityAfterUpdate) {
                 base::UTF16ToUTF8(system_app_name_) + " update",
             GetNotificationMessage());
   EXPECT_EQ("Restart to update", GetNotificationButton(0));
+
+  // Click the restart button.
+  message_center::MessageCenter::Get()->ClickOnNotificationButton(
+      kNotificationId, 0);
+
+  // Restart was requested.
+  EXPECT_EQ(1,
+            GetSessionControllerClient()->request_restart_for_update_count());
 }
 
 // Tests that the update icon becomes visible when an update becomes

chrome/browser/ui/ash/session_controller_client_impl.cc

@@ -229,6 +229,10 @@ void SessionControllerClientImpl::RequestSignOut() {
   chrome::AttemptUserExit();
 }
 
+void SessionControllerClientImpl::RequestRestartForUpdate() {
+  browser_shutdown::NotifyAndTerminate(/*fast_path=*/true);
+}
+
 void SessionControllerClientImpl::AttemptRestartChrome() {
   chrome::AttemptRestart();
 }

chrome/browser/ui/ash/session_controller_client_impl.h

@@ -82,6 +82,7 @@ class SessionControllerClientImpl
   void RequestLockScreen() override;
   void RequestHideLockScreen() override;
   void RequestSignOut() override;
+  void RequestRestartForUpdate() override;
   void AttemptRestartChrome() override;
   void SwitchActiveUser(const AccountId& account_id) override;
   void CycleActiveUser(ash::CycleUserDirection direction) override;

chrome/browser/ui/ash/system_tray_client_impl.cc

@@ -40,7 +40,6 @@
 #include "chrome/browser/browser_process_platform_part.h"
 #include "chrome/browser/chromeos/extensions/vpn_provider/vpn_service_factory.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
-#include "chrome/browser/lifetime/termination_notification.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/ash/system_web_apps/system_web_app_ui_utils.h"
 #include "chrome/browser/ui/browser_navigator_params.h"
@@ -696,10 +695,6 @@ void SystemTrayClientImpl::ShowFirmwareUpdate() {
   chrome::ShowFirmwareUpdatesApp(ProfileManager::GetActiveUserProfile());
 }
 
-void SystemTrayClientImpl::RequestRestartForUpdate() {
-  browser_shutdown::NotifyAndTerminate(/*fast_path=*/true);
-}
-
 void SystemTrayClientImpl::SetLocaleAndExit(
     const std::string& locale_iso_code) {
   ProfileManager::GetActiveUserProfile()->ChangeAppLocale(

chrome/browser/ui/ash/system_tray_client_impl.h

@@ -97,7 +97,6 @@ class SystemTrayClientImpl : public ash::SystemTrayClient,
   void ShowNetworkSettings(const std::string& network_id) override;
   void ShowMultiDeviceSetup() override;
   void ShowFirmwareUpdate() override;
-  void RequestRestartForUpdate() override;
   void SetLocaleAndExit(const std::string& locale_iso_code) override;
   void ShowAccessCodeCastingDialog(
       AccessCodeCastDialogOpenLocation open_location) override;