borealis: Installer changes for tests

Some minor changes for cleaning up some of the installer code and
making it more testable. Unit tests being introduced here CL:2392163
and browser tests here CL:2392285.

Tests: Tested manually on my test device and ran the new tests.
Bug: b:161650651

Change-Id: Ia241ec790096b33b56b54fcb579b08eef3a9ace8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2391891
Commit-Queue: Daniel Ng <danielng@google.com>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Reviewed-by: Nic Hollingum <hollingum@google.com>
Cr-Commit-Position: refs/heads/master@{#804857}

chrome/app/chromeos_strings.grdp

@@ -5621,7 +5621,7 @@
       Your device is low on storage. To increase free space, delete files from device.
   </message>
   <message name="IDS_BOREALIS_GENERIC_ERROR_MESSAGE" desc="" translateable="false">
-      Couldn't install <ph name="APP_NAME">$1<ex>BOREALIS</ex></ph>. Please try again later.
+      Couldn't install <ph name="APP_NAME">$1<ex>BOREALIS</ex></ph>. Please try again later. Error code: <ph name="ERROR_CODE">$2<ex>7</ex></ph>.
   </message>
   <!--
     ==================================================================================

chrome/browser/chromeos/BUILD.gn

@@ -3114,8 +3114,6 @@ source_set("unit_tests") {
     "authpolicy/authpolicy_helper.unittest.cc",
     "base/file_flusher_unittest.cc",
     "bluetooth/debug_logs_manager_unittest.cc",
-    "borealis/borealis_installer_mock.cc",
-    "borealis/borealis_installer_mock.h",
     "cert_provisioning/cert_provisioning_invalidator_unittest.cc",
     "cert_provisioning/cert_provisioning_platform_keys_helpers_unittest.cc",
     "cert_provisioning/cert_provisioning_scheduler_unittest.cc",

chrome/browser/chromeos/borealis/borealis_installer.cc

@@ -20,14 +20,4 @@ std::string BorealisInstaller::GetInstallingStateName(InstallingState state) {
   }
 }
 
-void BorealisInstaller::AddObserver(Observer* observer) {
-  DCHECK(!observer);
-  observers_.AddObserver(observer);
-}
-
-void BorealisInstaller::RemoveObserver(Observer* observer) {
-  DCHECK(!observer);
-  observers_.RemoveObserver(observer);
-}
-
 }  // namespace borealis

chrome/browser/chromeos/borealis/borealis_installer.h

@@ -55,8 +55,8 @@ class BorealisInstaller : public KeyedService {
   // Cancels the installation process.
   virtual void Cancel() = 0;
 
-  void AddObserver(Observer* observer);
-  void RemoveObserver(Observer* observer);
+  virtual void AddObserver(Observer* observer) = 0;
+  virtual void RemoveObserver(Observer* observer) = 0;
 
  protected:
   ~BorealisInstaller() override;

chrome/browser/chromeos/borealis/borealis_installer_impl.cc

@@ -43,12 +43,22 @@ void BorealisInstallerImpl::Cancel() {
   }
 }
 
+void BorealisInstallerImpl::AddObserver(Observer* observer) {
+  DCHECK(observer);
+  observers_.AddObserver(observer);
+}
+
+void BorealisInstallerImpl::RemoveObserver(Observer* observer) {
+  DCHECK(observer);
+  observers_.RemoveObserver(observer);
+}
+
 void BorealisInstallerImpl::StartDlcInstallation() {
   state_ = State::kInstalling;
   UpdateInstallingState(InstallingState::kInstallingDlc);
 
   chromeos::DlcserviceClient::Get()->Install(
-      "borealis-dlc",
+      kBorealisDlcName,
       base::BindOnce(&BorealisInstallerImpl::OnDlcInstallationCompleted,
                      weak_ptr_factory_.GetWeakPtr()),
       base::BindRepeating(
@@ -57,8 +67,13 @@ void BorealisInstallerImpl::StartDlcInstallation() {
 }
 
 void BorealisInstallerImpl::InstallationEnded(InstallationResult result) {
-  state_ = State::kIdle;
-  installing_state_ = InstallingState::kInactive;
+  // If another installation is in progress, we don't want to reset any states
+  // and interfere with the process. When that process completes, it will reset
+  // these states.
+  if (result != InstallationResult::kOperationInProgress) {
+    state_ = State::kIdle;
+    installing_state_ = InstallingState::kInactive;
+  }
   for (auto& observer : observers_) {
     observer.OnInstallationEnded(result);
   }
@@ -119,10 +134,6 @@ void BorealisInstallerImpl::OnDlcInstallationCompleted(
     const chromeos::DlcserviceClient::InstallResult& install_result) {
   DCHECK_EQ(installing_state_, InstallingState::kInstallingDlc);
   if (state_ == State::kCancelling) {
-    // Since DLC installation is currently the only step of installation,
-    // Borealis has actually been installed by this stage. This is calling
-    // CancelFinished() instead of InstallFinished(), to help provide clarity
-    // and also make it easier to add new installation steps in the future.
     InstallationEnded(InstallationResult::kCancelled);
     return;
   }
@@ -149,7 +160,7 @@ void BorealisInstallerImpl::OnDlcInstallationCompleted(
   } else if (install_result.error == dlcservice::kErrorNeedReboot) {
     LOG(ERROR)
         << "Device has pending update and needs a reboot to use Borealis DLC.";
-    result = InstallationResult::kDlcBusy;
+    result = InstallationResult::kDlcNeedReboot;
   } else if (install_result.error == dlcservice::kErrorAllocation) {
     LOG(ERROR) << "Device needs to free space to use Borealis DLC.";
     result = InstallationResult::kDlcNeedSpace;

chrome/browser/chromeos/borealis/borealis_installer_impl.h

@@ -29,6 +29,9 @@ class BorealisInstallerImpl : public BorealisInstaller {
   // Cancels the installation process.
   void Cancel() override;
 
+  void AddObserver(Observer* observer) override;
+  void RemoveObserver(Observer* observer) override;
+
  private:
   enum class State {
     kIdle,

chrome/browser/chromeos/borealis/borealis_installer_mock.cc

-// Copyright 2020 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/browser/chromeos/borealis/borealis_installer_mock.h"
-
-namespace borealis {
-namespace test {
-
-BorealisInstallerMock::BorealisInstallerMock() = default;
-BorealisInstallerMock::~BorealisInstallerMock() = default;
-
-}  // namespace test
-}  // namespace borealis

chrome/browser/chromeos/borealis/borealis_installer_mock.h

-// Copyright 2020 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_BROWSER_CHROMEOS_BOREALIS_BOREALIS_INSTALLER_MOCK_H_
-#define CHROME_BROWSER_CHROMEOS_BOREALIS_BOREALIS_INSTALLER_MOCK_H_
-
-#include "chrome/browser/chromeos/borealis/borealis_installer.h"
-#include "testing/gmock/include/gmock/gmock.h"
-
-namespace borealis {
-namespace test {
-
-class BorealisInstallerMock : public BorealisInstaller {
- public:
-  BorealisInstallerMock();
-  ~BorealisInstallerMock();
-  BorealisInstallerMock(const BorealisInstallerMock&) = delete;
-  BorealisInstallerMock& operator=(const BorealisInstallerMock&) = delete;
-
-  MOCK_METHOD(bool, IsProcessing, (), ());
-  MOCK_METHOD(void, Start, (), ());
-  MOCK_METHOD(void, Cancel, (), ());
-};
-
-}  // namespace test
-}  // namespace borealis
-
-#endif  // CHROME_BROWSER_CHROMEOS_BOREALIS_BOREALIS_INSTALLER_MOCK_H_

chrome/browser/chromeos/borealis/borealis_util.cc

@@ -9,6 +9,7 @@
 namespace borealis {
 
 const char kBorealisAppId[] = "dkecggknbdokeipkgnhifhiokailichf";
+const char kBorealisDlcName[] = "borealis-dlc";
 
 bool IsBorealisAllowed() {
   // Check that the Borealis feature is enabled.

chrome/browser/chromeos/borealis/borealis_util.h

@@ -12,6 +12,8 @@ namespace borealis {
 // This is used by the Borealis app and the Borealis installer.
 // Generated by crx_file::id_util::GenerateId("org.chromium.borealis");
 extern const char kBorealisAppId[];
+// This is used to install the Borealis DLC component.
+extern const char kBorealisDlcName[];
 
 // Checks if Borealis is allowed to run in the current environment.
 bool IsBorealisAllowed();

chrome/browser/ui/views/borealis/borealis_installer_view.cc

@@ -257,6 +257,7 @@ base::string16 BorealisInstallerView::GetPrimaryMessage() const {
       DCHECK(result_);
       switch (*result_) {
         case borealis::BorealisInstaller::InstallationResult::kNotAllowed:
+        case borealis::BorealisInstaller::InstallationResult::kDlcUnsupported:
           return l10n_util::GetStringFUTF16(
               IDS_BOREALIS_INSTALLER_NOT_ALLOWED_TITLE, app_name_);
         default:
@@ -303,15 +304,22 @@ base::string16 BorealisInstallerView::GetSecondaryMessage() const {
           return l10n_util::GetStringFUTF16(
               IDS_BOREALIS_DLC_NEED_REBOOT_FAILED_MESSAGE, app_name_);
         case ResultEnum::kDlcNeedSpace:
-          return l10n_util::GetStringFUTF16(
-              IDS_BOREALIS_INSUFFICIENT_DISK_SPACE_MESSAGE, app_name_);
+          return l10n_util::GetStringUTF16(
+              IDS_BOREALIS_INSUFFICIENT_DISK_SPACE_MESSAGE);
         case ResultEnum::kDlcUnknown:
-          return l10n_util::GetStringFUTF16(IDS_BOREALIS_GENERIC_ERROR_MESSAGE,
-                                            app_name_);
+          return l10n_util::GetStringFUTF16(
+              IDS_BOREALIS_GENERIC_ERROR_MESSAGE, app_name_,
+              base::NumberToString16(
+                  static_cast<std::underlying_type_t<ResultEnum>>(*result_)));
       }
   }
 }
 
+void BorealisInstallerView::SetInstallingStateForTesting(
+    InstallingState new_state) {
+  installing_state_ = new_state;
+}
+
 int BorealisInstallerView::GetCurrentDialogButtons() const {
   switch (state_) {
     case State::kInstalling:

chrome/browser/ui/views/borealis/borealis_installer_view.h

@@ -24,6 +24,8 @@ class Profile;
 class BorealisInstallerView : public views::DialogDelegateView,
                               public borealis::BorealisInstaller::Observer {
  public:
+  using InstallingState = borealis::BorealisInstaller::InstallingState;
+
   explicit BorealisInstallerView(Profile* profile);
 
   // Disallow copy and assign.
@@ -51,6 +53,8 @@ class BorealisInstallerView : public views::DialogDelegateView,
   base::string16 GetPrimaryMessage() const;
   base::string16 GetSecondaryMessage() const;
 
+  void SetInstallingStateForTesting(InstallingState new_state);
+
  private:
   class TitleLabel;
   enum class State {
@@ -60,8 +64,6 @@ class BorealisInstallerView : public views::DialogDelegateView,
     kError,           // Something unexpected happened.
   };
 
-  using InstallingState = borealis::BorealisInstaller::InstallingState;
-
   ~BorealisInstallerView() override;
 
   // Returns the dialog buttons that should be displayed, based on the current