Add more browser tests for Kiosk update from usb stick.

Review URL: https://codereview.chromium.org/509253003

BUG=410611

Review URL: https://codereview.chromium.org/540673003

Cr-Commit-Position: refs/heads/master@{#293567}

chrome/browser/chromeos/app_mode/kiosk_app_manager.cc

@@ -423,6 +423,12 @@ void KioskAppManager::OnKioskAppCacheUpdated(const std::string& app_id) {
       KioskAppManagerObserver, observers_, OnKioskAppCacheUpdated(app_id));
 }
 
+void KioskAppManager::OnKioskAppExternalUpdateComplete(bool success) {
+  FOR_EACH_OBSERVER(KioskAppManagerObserver,
+                    observers_,
+                    OnKioskAppExternalUpdateComplete(success));
+}
+
 void KioskAppManager::PutValidatedExternalExtension(
     const std::string& app_id,
     const base::FilePath& crx_path,

chrome/browser/chromeos/app_mode/kiosk_app_manager.h

@@ -186,6 +186,10 @@ class KioskAppManager : public KioskAppDataDelegate,
   // Invoked when kiosk app cache has been updated.
   void OnKioskAppCacheUpdated(const std::string& app_id);
 
+  // Invoked when kiosk app updating from usb stick has been completed.
+  // |success| indicates if all the updates are completed successfully.
+  void OnKioskAppExternalUpdateComplete(bool success);
+
   // Installs the validated external extension into cache.
   void PutValidatedExternalExtension(
       const std::string& app_id,

chrome/browser/chromeos/app_mode/kiosk_app_manager_observer.h

@@ -29,6 +29,10 @@ class KioskAppManagerObserver {
   // Invoked when kiosk app cache is updated for |app_id|.
   virtual void OnKioskAppCacheUpdated(const std::string& app_id) {}
 
+  // Invoked when kiosk app updating from usb stick has been completed.
+  // |success| indicates if all the updates are completed successfully.
+  virtual void OnKioskAppExternalUpdateComplete(bool success) {}
+
  protected:
   virtual ~KioskAppManagerObserver() {}
 };

chrome/browser/chromeos/app_mode/kiosk_external_updater.cc

@@ -242,11 +242,13 @@ void KioskExternalUpdater::ProcessParsedManifest(
     NotifyKioskUpdateProgress(
         ui::ResourceBundle::GetSharedInstance().GetLocalizedString(
             IDS_KIOSK_EXTERNAL_UPDATE_NO_MANIFEST));
+    KioskAppManager::Get()->OnKioskAppExternalUpdateComplete(false);
     return;
   } else if (*parsing_error == ERROR_INVALID_MANIFEST) {
     NotifyKioskUpdateProgress(
         ui::ResourceBundle::GetSharedInstance().GetLocalizedString(
             IDS_KIOSK_EXTERNAL_UPDATE_INVALID_MANIFEST));
+    KioskAppManager::Get()->OnKioskAppExternalUpdateComplete(false);
     return;
   }
 
@@ -301,6 +303,7 @@ void KioskExternalUpdater::ProcessParsedManifest(
     NotifyKioskUpdateProgress(
         ui::ResourceBundle::GetSharedInstance().GetLocalizedString(
             IDS_KIOSK_EXTERNAL_UPDATE_NO_UPDATES));
+    KioskAppManager::Get()->OnKioskAppExternalUpdateComplete(false);
     return;
   }
 
@@ -347,6 +350,17 @@ bool KioskExternalUpdater::IsExternalUpdatePending() {
   return false;
 }
 
+bool KioskExternalUpdater::IsAllExternalUpdatesSucceeded() {
+  for (ExternalUpdateMap::iterator it = external_updates_.begin();
+       it != external_updates_.end();
+       ++it) {
+    if (it->second.update_status != SUCCESS) {
+      return false;
+    }
+  }
+  return true;
+}
+
 bool KioskExternalUpdater::ShouldDoExternalUpdate(
     const std::string& app_id,
     const std::string& version,
@@ -440,6 +454,8 @@ void KioskExternalUpdater::MayBeNotifyKioskAppUpdate() {
 
   NotifyKioskUpdateProgress(GetUpdateReportMessage());
   NotifyKioskAppUpdateAvailable();
+  KioskAppManager::Get()->OnKioskAppExternalUpdateComplete(
+      IsAllExternalUpdatesSucceeded());
 }
 
 void KioskExternalUpdater::NotifyKioskAppUpdateAvailable() {

chrome/browser/chromeos/app_mode/kiosk_external_updater.h

@@ -10,6 +10,7 @@
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
+#include "base/observer_list.h"
 #include "base/sequenced_task_runner.h"
 #include "chrome/browser/chromeos/app_mode/kiosk_external_update_validator.h"
 #include "chromeos/disks/disk_mount_manager.h"
@@ -89,6 +90,10 @@ class KioskExternalUpdater : public disks::DiskMountManager::Observer,
   // Returns true if there are any external updates pending.
   bool IsExternalUpdatePending();
 
+  // Returns true if all external updates specified in the manifest are
+  // completed successfully.
+  bool IsAllExternalUpdatesSucceeded();
+
   // Returns true if the app with |app_id| should be updated to
   // |external_extension|.
   bool ShouldDoExternalUpdate(const std::string& app_id,

chrome/test/data/chromeos/app_mode/external_update/bad_crx/external_update.json

+// Dictionary of external kiosk extensions to be updated.  Each entry maps
+// the extension's id to its crx's path (relative to this file) and the version
+// of the extension contained in the crx.
+{
+  "ajoggoflpgplnnjkjamcmbepjdjdnpdp" : {
+    "external_crx": "ajoggoflpgplnnjkjamcmbepjdjdnpdp-2.0.0.crx",
+    "external_version": "2.0.0"
+  }
+}

chrome/test/data/chromeos/app_mode/external_update/bad_manifest/external_update.json

+// Dictionary of external kiosk extensions to be updated.  Each entry maps
+// the extension's id to its crx's path (relative to this file) and the version
+// of the extension contained in the crx.
+{
+  "ajoggoflpgplnnjkjamcmbepjdjdnpdp" : {
+    "external_crx": "ajoggoflpgplnnjkjamcmbepjdjdnpdp-2.0.0.crx",
+    "external_version": "2.0.0"
+  //}  make this an invalid json file
+}

chrome/test/data/chromeos/app_mode/external_update/lower_app_version/external_update.json

+// Dictionary of external kiosk extensions to be updated.  Each entry maps
+// the extension's id to its crx's path (relative to this file) and the version
+// of the extension contained in the crx.
+{
+  "ajoggoflpgplnnjkjamcmbepjdjdnpdp" : {
+    "external_crx": "ajoggoflpgplnnjkjamcmbepjdjdnpdp-1.0.0.crx",
+    "external_version": "1.0.0"
+  }
+}

chrome/test/data/chromeos/app_mode/external_update/lower_crx_version/external_update.json

+// Dictionary of external kiosk extensions to be updated.  Each entry maps
+// the extension's id to its crx's path (relative to this file) and the version
+// of the extension contained in the crx.
+{
+  "ajoggoflpgplnnjkjamcmbepjdjdnpdp" : {
+    "external_crx": "ajoggoflpgplnnjkjamcmbepjdjdnpdp-3.0.0.crx",
+    "external_version": "3.0.0"
+  }
+}

chrome/test/data/chromeos/app_mode/external_update/update_pass/external_update.json

+// Dictionary of external kiosk extensions to be updated.  Each entry maps
+// the extension's id to its crx's path (relative to this file) and the version
+// of the extension contained in the crx.
+{
+  "ajoggoflpgplnnjkjamcmbepjdjdnpdp" : {
+    "external_crx": "ajoggoflpgplnnjkjamcmbepjdjdnpdp-2.0.0.crx",
+    "external_version": "2.0.0"
+  }
+}