Make sure to close ARC-owned SelectFileDialogs when FileSystem connection is closed.

BUG=chromium:983047
TEST=Opt-out ARC and check if SelectFileDialog is closed

Change-Id: I3301d3c66b621f5cfbf1f0823bf4e9a17d6a57d6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1705910
Commit-Queue: Satoshi Niwa <niwa@chromium.org>
Reviewed-by: Ryo Hashimoto <hashimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#678540}

chrome/browser/chromeos/arc/fileapi/arc_file_system_bridge.cc

@@ -180,10 +180,12 @@ ArcFileSystemBridge::ArcFileSystemBridge(content::BrowserContext* context,
       weak_ptr_factory_(this) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   bridge_service_->file_system()->SetHost(this);
+  bridge_service_->file_system()->AddObserver(this);
 }
 
 ArcFileSystemBridge::~ArcFileSystemBridge() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+  bridge_service_->file_system()->RemoveObserver(this);
   bridge_service_->file_system()->SetHost(nullptr);
 }
 
@@ -334,11 +336,6 @@ void ArcFileSystemBridge::OnFileSelectorEvent(
     mojom::FileSelectorEventPtr event,
     ArcFileSystemBridge::OnFileSelectorEventCallback callback) {
   std::string track;
-  if (!IsTestImageBuild()) {
-    LOG(ERROR) << "OnFileSelectorEvent is only allowed under test conditions";
-    std::move(callback).Run();
-    return;
-  }
   select_files_handlers_manager_->OnFileSelectorEvent(std::move(event),
                                                       std::move(callback));
 }
@@ -443,4 +440,10 @@ void ArcFileSystemBridge::OnReadRequestCompleted(
   file_stream_forwarders_.erase(it);
 }
 
+void ArcFileSystemBridge::OnConnectionClosed() {
+  LOG(WARNING) << "FileSystem connection has been closed. "
+               << "Closing SelectFileDialogs owned by ARC apps, if any.";
+  select_files_handlers_manager_->DeleteAllHandlers();
+}
+
 }  // namespace arc

chrome/browser/chromeos/arc/fileapi/arc_file_system_bridge.h

@@ -18,6 +18,7 @@
 #include "chrome/browser/chromeos/arc/fileapi/arc_select_files_handler.h"
 #include "chrome/browser/chromeos/arc/fileapi/file_stream_forwarder.h"
 #include "components/arc/common/file_system.mojom.h"
+#include "components/arc/session/connection_observer.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "storage/browser/fileapi/watcher_manager.h"
 
@@ -34,7 +35,10 @@ namespace arc {
 class ArcBridgeService;
 
 // This class handles file system related IPC from the ARC container.
-class ArcFileSystemBridge : public KeyedService, public mojom::FileSystemHost {
+class ArcFileSystemBridge
+    : public KeyedService,
+      public ConnectionObserver<mojom::FileSystemInstance>,
+      public mojom::FileSystemHost {
  public:
   class Observer {
    public:
@@ -95,6 +99,9 @@ class ArcFileSystemBridge : public KeyedService, public mojom::FileSystemHost {
       mojom::GetFileSelectorElementsRequestPtr request,
       GetFileSelectorElementsCallback callback) override;
 
+  // ConnectionObserver<mojom::FileSystemInstance> overrides:
+  void OnConnectionClosed() override;
+
  private:
   // Used to implement OpenFileToRead().
   void OpenFileToReadAfterGetFileSize(const GURL& url_decoded,

chrome/browser/chromeos/arc/fileapi/arc_select_files_handler.cc

@@ -225,7 +225,10 @@ ArcSelectFilesHandler::ArcSelectFilesHandler(content::BrowserContext* context)
   dialog_holder_ = std::make_unique<SelectFileDialogHolder>(this);
 }
 
-ArcSelectFilesHandler::~ArcSelectFilesHandler() = default;
+ArcSelectFilesHandler::~ArcSelectFilesHandler() {
+  // Make sure to close SelectFileDialog when the handler is destroyed.
+  dialog_holder_->ExecuteJavaScript(kScriptClickCancel, {});
+}
 
 void ArcSelectFilesHandler::SelectFiles(
     const mojom::SelectFilesRequestPtr& request,

chrome/browser/chromeos/arc/fileapi/arc_select_files_handler.h

@@ -40,6 +40,9 @@ class ArcSelectFilesHandlersManager {
   explicit ArcSelectFilesHandlersManager(content::BrowserContext* context);
   ~ArcSelectFilesHandlersManager();
 
+  // Delete all handlers and close all SelectFileDialogs.
+  void DeleteAllHandlers() { handlers_by_task_id_.clear(); }
+
   // Handler for FileSystemHost.SelectFiles.
   // Creates a new ArcSelectFilesHandler instance.
   void SelectFiles(const mojom::SelectFilesRequestPtr& request,

chrome/browser/chromeos/arc/fileapi/arc_select_files_handler_unittest.cc

@@ -289,6 +289,10 @@ TEST_F(ArcSelectFilesHandlerTest, OnFileSelectorEvent) {
   CallOnFileSelectorEventAndCheckScript(
       mojom::FileSelectorEventType::CLICK_FILE, "Click\tTarget",
       base::StringPrintf(kScriptClickFile, "\"Click\\tTarget\""));
+
+  // The handler executes click-cancel script in its destructor.
+  EXPECT_CALL(*mock_dialog_holder_, ExecuteJavaScript(kScriptClickCancel, _))
+      .Times(1);
 }
 
 TEST_F(ArcSelectFilesHandlerTest, GetFileSelectorElements) {
@@ -316,6 +320,10 @@ TEST_F(ArcSelectFilesHandlerTest, GetFileSelectorElements) {
 
   arc_select_files_handler_->GetFileSelectorElements(
       arc::mojom::GetFileSelectorElementsRequest::New(), callback.Get());
+
+  // The handler executes click-cancel script in its destructor.
+  EXPECT_CALL(*mock_dialog_holder_, ExecuteJavaScript(kScriptClickCancel, _))
+      .Times(1);
 }
 
 }  // namespace arc