Fix login screen UI window not closing when extension is unloaded

Currently, |login_screen_ui::UiHandler| only closes the login screen UI
window when the extension is uninstalled, and not when it is unloaded.
When an extension is updated, the old instance is unloaded and not
uninstalled. This means when an update occurs when the old instance has
a window open, this window will not be closed, and the new instance
will not be able to open another window.

This CL updates |UiHandler| to also close the window when the extension
is unloaded.

Bug: 957573
Change-Id: If586fa5cc83fca20d971e85080389d013b854e66
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2002610
Commit-Queue: Jit Yao Yap <jityao@google.com>
Reviewed-by: Alexander Hendrich <hendrich@chromium.org>
Cr-Commit-Position: refs/heads/master@{#732849}

chrome/browser/chromeos/extensions/login_screen/login_screen_ui/ui_handler.cc

@@ -181,6 +181,18 @@ void UiHandler::OnSessionStateChanged() {
 void UiHandler::OnExtensionUninstalled(content::BrowserContext* browser_context,
                                        const extensions::Extension* extension,
                                        extensions::UninstallReason reason) {
+  HandleExtensionUnloadOrUinstall(extension);
+}
+
+void UiHandler::OnExtensionUnloaded(
+    content::BrowserContext* browser_context,
+    const extensions::Extension* extension,
+    extensions::UnloadedExtensionReason reason) {
+  HandleExtensionUnloadOrUinstall(extension);
+}
+
+void UiHandler::HandleExtensionUnloadOrUinstall(
+    const extensions::Extension* extension) {
   RemoveWindowForExtension(extension->id());
 }
 

chrome/browser/chromeos/extensions/login_screen/login_screen_ui/ui_handler.h

@@ -14,6 +14,7 @@
 #include "components/session_manager/core/session_manager_observer.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_registry_observer.h"
+#include "extensions/browser/unloaded_extension_reason.h"
 
 namespace extensions {
 class Extension;
@@ -82,6 +83,13 @@ class UiHandler : public session_manager::SessionManagerObserver,
                               const extensions::Extension* extension,
                               extensions::UninstallReason reason) override;
 
+  // extensions::ExtensionRegistryObserver
+  void OnExtensionUnloaded(content::BrowserContext* browser_context,
+                           const extensions::Extension* extension,
+                           extensions::UnloadedExtensionReason reason) override;
+
+  void HandleExtensionUnloadOrUinstall(const extensions::Extension* extension);
+
   std::unique_ptr<WindowFactory> window_factory_;
 
   bool login_or_lock_screen_active_ = false;

chrome/browser/chromeos/extensions/login_screen/login_screen_ui/ui_handler_unittest.cc

@@ -19,6 +19,7 @@
 #include "components/version_info/version_info.h"
 #include "content/public/test/browser_task_environment.h"
 #include "extensions/browser/extension_registry.h"
+#include "extensions/browser/unloaded_extension_reason.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_builder.h"
 #include "extensions/common/features/feature_channel.h"
@@ -337,6 +338,18 @@ TEST_F(LoginScreenExtensionUiHandlerUnittest, WindowClosedOnUninstall) {
   EXPECT_FALSE(ui_handler_->HasOpenWindow(extension_->id()));
 }
 
+TEST_F(LoginScreenExtensionUiHandlerUnittest, WindowClosedOnUnloaded) {
+  // Open window.
+  CheckCanOpenWindow(extension_.get());
+  EXPECT_TRUE(ui_handler_->HasOpenWindow(extension_->id()));
+
+  // Simulate extension unload.
+  extension_registry_->RemoveEnabled(extension_->id());
+  extension_registry_->TriggerOnUnloaded(
+      extension_.get(), extensions::UnloadedExtensionReason::BLACKLIST);
+  EXPECT_FALSE(ui_handler_->HasOpenWindow(extension_->id()));
+}
+
 TEST_F(LoginScreenExtensionUiHandlerUnittest,
        OpenWindowWithDifferentArguments) {
   // Open window.