Add more browser tests for Kiosk update from usb stick.

chrome/browser/chromeos/app_mode/kiosk_external_updater.cc

 // Copyright 2014 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/app_mode/kiosk_external_updater.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/files/file_enumerator.h"
 #include "base/json/json_file_value_serializer.h"
@@ skipping 224 matching lines @@
 void KioskExternalUpdater::ProcessParsedManifest(
     ExternalUpdateErrorCode* parsing_error,
     const base::FilePath& external_update_dir,
     base::DictionaryValue* parsed_manifest) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   if (*parsing_error == ERROR_NO_MANIFEST) {
     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;
   }
 
   external_update_path_ = external_update_dir;
   for (base::DictionaryValue::Iterator it(*parsed_manifest); !it.IsAtEnd();
        it.Advance()) {
     std::string app_id = it.key();
     std::string cached_version_str;
     base::FilePath cached_crx;
     if (!KioskAppManager::Get()->GetCachedCrx(
@@ skipping 34 matching lines @@
     }
     update.external_crx = external_update_path_.AppendASCII(external_crx_str);
     update.update_status = PENDING;
     external_updates_[app_id] = update;
   }
 
   if (external_updates_.empty()) {
     NotifyKioskUpdateProgress(
         ui::ResourceBundle::GetSharedInstance().GetLocalizedString(
             IDS_KIOSK_EXTERNAL_UPDATE_NO_UPDATES));
+    KioskAppManager::Get()->OnKioskAppExternalUpdateComplete(false);
     return;
   }
 
   ValidateExternalUpdates();
 }
 
 bool KioskExternalUpdater::CheckExternalUpdateInterrupted() {
   if (external_updates_.empty()) {
     // This could happen if user pulls out the usb stick before the updating
     // operation is completed.
@@ skipping 26 matching lines @@
   for (ExternalUpdateMap::iterator it = external_updates_.begin();
        it != external_updates_.end();
        ++it) {
     if (it->second.update_status == PENDING) {
       return true;
     }
   }
   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,
     const std::string& min_browser_version) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   std::string existing_version_str;
   base::FilePath existing_path;
   bool cached = KioskAppManager::Get()->GetCachedCrx(
       app_id, &existing_path, &existing_version_str);
@@ skipping 73 matching lines @@
   else
     MayBeNotifyKioskAppUpdate();
 }
 
 void KioskExternalUpdater::MayBeNotifyKioskAppUpdate() {
   if (IsExternalUpdatePending())
     return;
 
   NotifyKioskUpdateProgress(GetUpdateReportMessage());
   NotifyKioskAppUpdateAvailable();
+  KioskAppManager::Get()->OnKioskAppExternalUpdateComplete(
+      IsAllExternalUpdatesSucceeded());
 }
 
 void KioskExternalUpdater::NotifyKioskAppUpdateAvailable() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   for (ExternalUpdateMap::iterator it = external_updates_.begin();
        it != external_updates_.end();
        ++it) {
     if (it->second.update_status == SUCCESS) {
       KioskAppManager::Get()->OnKioskAppCacheUpdated(it->first);
     }
@@ skipping 55 matching lines @@
   if (failed) {
     failed_app_msg = ui::ResourceBundle::GetSharedInstance().GetLocalizedString(
                          IDS_KIOSK_EXTERNAL_UPDATE_FAILED_UPDATED_APPS) +
                      base::ASCIIToUTF16("\n") + failed_apps;
     message = message + base::ASCIIToUTF16("\n") + failed_app_msg;
   }
   return message;
 }
 
 }  // namespace chromeos