Check import module update before launching the primary kiosk app.

chrome/browser/chromeos/login/kiosk_browsertest.cc

 // Copyright (c) 2013 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 <vector>
 
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/desktop_background/desktop_background_controller_observer.h"
 #include "ash/shell.h"
 #include "base/bind.h"
@@ skipping 99 matching lines @@
 // An app to test local fs data persistence across app update. V1 app writes
 // data into local fs. V2 app reads and verifies the data.
 // Webstore data json is in
 //   chrome/test/data/chromeos/app_mode/webstore/inlineinstall/
 //       detail/bmbpicmpniaclbbpdkfglgipkkebnbjf
 const char kTestLocalFsKioskApp[] = "bmbpicmpniaclbbpdkfglgipkkebnbjf";
 
 // An app to test local access to file systems via the
 // chrome.fileSystem.requestFileSystem API.
 // Webstore data json is in
-//   chrome/test/data/chromeos/app_mode/webstore/inlineinstall/
-//       detail/aaedpojejpghjkedenggihopfhfijcko
+//     chrome/test/data/chromeos/app_mode/webstore/inlineinstall/
+//         detail/aaedpojejpghjkedenggihopfhfijcko
 const char kTestGetVolumeListKioskApp[] = "aaedpojejpghjkedenggihopfhfijcko";
 
-// Testing apps for testing kiosk multi-app feature.
-const char kTestPrimaryKioskApp[] = "ceobkcclegcliomogfoeoheahogoecgl";
-const char kTestSecondaryApp1[] = "ihplaomghjbeafnpnjkhppmfpnmdihgd";
-const char kTestSecondaryApp2[] = "fiehokkcgaojmbhfhlpiheggjhaedjoc";
-const char kTestSecondaryApp3[] = "aabnpdpieclcikafhdkkpldcaodmfoai";
-const char kTestSecondaryExtension[] = "imlgadjgphbjkaceoiapiephhgeofhic";
+// Testing apps for testing kiosk multi-app feature. All the crx files are in
+//    chrome/test/data/chromeos/app_mode/webstore/downloads.
+
+// Source files are in
+//     chrome/test/data/chromeos/app_mode/multi_app_kiosk/src/primary_app
+const char kTestPrimaryKioskApp[] = "dpejijbnadgcgmabkmcoajkgongfgnii";
+
+// Source files are in
+//     chrome/test/data/chromeos/app_mode/multi_app_kiosk/src/secondary_app_1
+const char kTestSecondaryApp1[] = "emnbflhfbllbehnpjmjddklbkeeoaaeg";
+
+// Source files are in
+//     chrome/test/data/chromeos/app_mode/multi_app_kiosk/src/secondary_app_2
+const char kTestSecondaryApp2[] = "blmjgfbajihimkjmepbhgmjbopjchlda";
+
+// Source files are in
+//     chrome/test/data/chromeos/app_mode/multi_app_kiosk/src/secondary_app_3
+const char kTestSecondaryApp3[] = "jkofhenkpndpdflehcjpcekgecjkpggg";
+
+// Source files are in
+//     chrome/test/data/chromeos/app_mode/multi_app_kiosk/src/
+//         secondary_extensions_1
+const char kTestSecondaryExtension[] = "gdmgkkoghcihimdfoabkefdkccllcfea";
+
+// Source files are in
+//     chrome/test/data/chromeos/app_mode/multi_app_kiosk/src/
+//         shared_module_primary_app
 const char kTestSharedModulePrimaryApp[] = "ofmeihgcmabfalhhgooajcijiaoekhkg";
+
+// Source files are in
+//     chrome/test/data/chromeos/app_mode/multi_app_kiosk/src/secondary_app
 const char kTestSecondaryApp[] = "bbmaiojbgkkmfaglfhaplfomobgojhke";
+
+// Source files are in
+//     chrome/test/data/chromeos/app_mode/multi_app_kiosk/src/shared_module
 const char kTestSharedModuleId[] = "biebhpdepndljbnkadldcbjkiedldnmn";
+
+// Source files are in
+//     chrome/test/data/chromeos/app_mode/multi_app_kiosk/src/
+//         secondary_extension
 const char kTestSecondaryExt[] = "kcoobopfcjmbfeppibolpaolbgbmkcjd";
 
 // Fake usb stick mount path.
 const char kFakeUsbMountPathUpdatePass[] =
     "chromeos/app_mode/external_update/update_pass";
 const char kFakeUsbMountPathNoManifest[] =
     "chromeos/app_mode/external_update/no_manifest";
 const char kFakeUsbMountPathBadManifest[] =
     "chromeos/app_mode/external_update/bad_manifest";
 const char kFakeUsbMountPathLowerAppVersion[] =
@@ skipping 53 matching lines @@
 void OnNetworkWaitTimedOut(const base::Closure& runner_quit_task) {
   runner_quit_task.Run();
 }
 
 // Helper function for LockFileThread.
 void LockAndUnlock(scoped_ptr<base::Lock> lock) {
   lock->Acquire();
   lock->Release();
 }
 
-bool IsAppInstalled(const std::string& app_id) {
+bool IsAppInstalled(const std::string& app_id, const std::string& version) {
   Profile* app_profile = ProfileManager::GetPrimaryUserProfile();
   DCHECK(app_profile);
   const extensions::Extension* app =
       extensions::ExtensionSystem::Get(app_profile)
           ->extension_service()
           ->GetInstalledExtension(app_id);
-  return app != nullptr;
+  return app != nullptr && version == app->version()->GetString();
 }
 
 extensions::Manifest::Type GetAppType(const std::string& app_id) {
   Profile* app_profile = ProfileManager::GetPrimaryUserProfile();
   DCHECK(app_profile);
   const extensions::Extension* app =
       extensions::ExtensionSystem::Get(app_profile)
           ->extension_service()
           ->GetInstalledExtension(app_id);
   DCHECK(app);
@@ skipping 253 matching lines @@
   }
 
   void SetUpOnMainThread() override {
     OobeBaseTest::SetUpOnMainThread();
     // Needed to avoid showing Gaia screen instead of owner signin for
     // consumer network down test cases.
     StartupUtils::MarkDeviceRegistered(base::Closure());
     settings_helper_.ReplaceProvider(kAccountsPrefDeviceLocalAccounts);
     owner_settings_service_ = settings_helper_.CreateOwnerSettingsService(
         ProfileManager::GetPrimaryUserProfile());
+
+    // Set up local cache for app update check.
+    CreateAndInitializeLocalCache();
   }
 
   void TearDownOnMainThread() override {
     settings_helper_.RestoreProvider();
     AppLaunchController::SetNetworkTimeoutCallbackForTesting(NULL);
     AppLaunchSigninScreen::SetUserManagerForTesting(NULL);
 
     OobeBaseTest::TearDownOnMainThread();
 
     // Clean up while main thread still runs.
     // See http://crbug.com/176659.
     KioskAppManager::Get()->CleanUp();
   }
 
+  // The local cache is supposed to be initialized on chromeos device, and a
+  // ready flag file will be pre-created to mark the ready state, before chrome
+  // starts. In order for the tests to run without being on real chromeos
+  // device, we need to manually create this file.
+  void CreateAndInitializeLocalCache() {
+    base::FilePath extension_cache_dir;
+    CHECK(PathService::Get(chromeos::DIR_DEVICE_EXTENSION_LOCAL_CACHE,
+                           &extension_cache_dir));

[xiyuan, 2015/12/03 00:46:53]

Oops. We really should not be doing this. We should create a temp dir using
ScopedTempDir and override it with ScopedPathOverride.

Otherwise, tests may fail when the default dir is not present or writable on the
bots, and we leave some state which might affect other tests.

[jennyz, 2015/12/03 01:23:47]

It looks like the path is already overrided at RegisterStubPathOverrides() and
created under a temporary directory:
https://code.google.com/p/chromium/codesearch#chromium/src/chromeos/chromeos_...

[xiyuan, 2015/12/03 03:05:38]

I see. Never mind then.

+    base::FilePath cache_init_file = extension_cache_dir.Append(
+        extensions::LocalExtensionCache::kCacheReadyFlagFileName);
+    EXPECT_EQ(base::WriteFile(cache_init_file, "", 0), 0);
+  }
+
   void SetUpCommandLine(base::CommandLine* command_line) override {
     OobeBaseTest::SetUpCommandLine(command_line);
     fake_cws_->Init(embedded_test_server());
   }
 
   void LaunchApp(const std::string& app_id, bool diagnostic_mode) {
     bool new_kiosk_ui = KioskAppMenuHandler::EnableNewKioskUI();
     GetLoginUI()->CallJavascriptFunction(new_kiosk_ui ?
         kLaunchAppForTestNewAPI : kLaunchAppForTestOldAPI,
         base::StringValue(app_id),
@@ skipping 810 matching lines @@
     KioskTest::TearDown();
   }
 
   void SetUpOnMainThread() override {
     // For update tests, we cache the app in the PRE part, and then we load it
     // in the test, so we need to both store the apps list on teardown (so that
     // the app manager would accept existing files in its extension cache on the
     // next startup) and copy the list to our stub settings provider as well.
     settings_helper_.CopyStoredValue(kAccountsPrefDeviceLocalAccounts);
 
-    CreateAndInitializeLocalCache();
-
     KioskTest::SetUpOnMainThread();
   }
 
   void TearDownOnMainThread() override {
     settings_helper_.StoreCachedDeviceSetting(kAccountsPrefDeviceLocalAccounts);
     KioskTest::TearDownOnMainThread();
   }
 
   void PreCacheApp(const std::string& app_id,
                    const std::string& version,
@@ skipping 75 matching lines @@
       fake_cws()->SetUpdateCrx(app.id, app.crx_filename, app.version);
     }
 
     // Launch the primary app.
     StartUIForAppLaunch();
     SimulateNetworkOnline();
     LaunchApp(test_app_id(), false);
     WaitForAppLaunchWithOptions(false, true);
 
     // Verify the primary app and the secondary apps are all installed.
-    EXPECT_EQ(primary_app.version, GetInstalledAppVersion().GetString());
+    EXPECT_TRUE(IsAppInstalled(primary_app.id, primary_app.version));
     for (const auto& app : secondary_apps) {
-      EXPECT_TRUE(IsAppInstalled(app.id));
+      EXPECT_TRUE(IsAppInstalled(app.id, app.version));
       EXPECT_EQ(GetAppType(app.id), app.type);
     }
   }
 
   void LaunchTestKioskAppWithTwoSecondaryApps() {
     TestAppInfo primary_app(kTestPrimaryKioskApp, "1.0.0",
                             std::string(kTestPrimaryKioskApp) + "-1.0.0.crx",
                             extensions::Manifest::TYPE_PLATFORM_APP);
 
     std::vector<TestAppInfo> secondary_apps;
@@ skipping 36 matching lines @@
                               extensions::Manifest::TYPE_PLATFORM_APP);
     secondary_apps.push_back(secondary_app);
     // Setting up FakeCWS for shared module is the same for shared module as
     // for kiosk secondary apps.
     TestAppInfo shared_module(kTestSharedModuleId, "1.0.0",
                               std::string(kTestSharedModuleId) + "-1.0.0.crx",
                               extensions::Manifest::TYPE_SHARED_MODULE);
     secondary_apps.push_back(shared_module);
 
     LaunchKioskWithSecondaryApps(primary_app, secondary_apps);
-    EXPECT_TRUE(IsAppInstalled(kTestSharedModuleId));
+    EXPECT_TRUE(IsAppInstalled(shared_module.id, shared_module.version));
+  }
+
+  void LaunchAppWithSharedModule() {
+    TestAppInfo primary_app(
+        kTestSharedModulePrimaryApp, "2.0.0",
+        std::string(kTestSharedModulePrimaryApp) + "-2.0.0.crx",
+        extensions::Manifest::TYPE_PLATFORM_APP);
+
+    std::vector<TestAppInfo> secondary_apps;
+    // Setting up FakeCWS for shared module is the same for shared module as
+    // for kiosk secondary apps.
+    TestAppInfo shared_module(kTestSharedModuleId, "1.0.0",
+                              std::string(kTestSharedModuleId) + "-1.0.0.crx",
+                              extensions::Manifest::TYPE_SHARED_MODULE);
+    secondary_apps.push_back(shared_module);
+
+    LaunchKioskWithSecondaryApps(primary_app, secondary_apps);
   }
 
  private:
   class KioskAppExternalUpdateWaiter : public KioskAppManagerObserver {
    public:
     KioskAppExternalUpdateWaiter(KioskAppManager* manager,
                                  const std::string& app_id)
         : runner_(NULL),
           manager_(manager),
           app_id_(app_id),
@@ skipping 34 matching lines @@
     scoped_refptr<content::MessageLoopRunner> runner_;
     KioskAppManager* manager_;
     const std::string app_id_;
     bool quit_;
     bool update_success_;
     bool app_update_notified_;
 
     DISALLOW_COPY_AND_ASSIGN(KioskAppExternalUpdateWaiter);
   };
 
-  // The local cache is supposed to be initialized on chromeos device, and a
-  // ready flag file will be pre-created to mark the ready state, before chrome
-  // starts. In order for the tests to run without being on real chromeos
-  // device, we need to manually create this file.
-  void CreateAndInitializeLocalCache() {
-    base::FilePath extension_cache_dir;
-    CHECK(PathService::Get(chromeos::DIR_DEVICE_EXTENSION_LOCAL_CACHE,
-                           &extension_cache_dir));
-    base::FilePath cache_init_file = extension_cache_dir.Append(
-        extensions::LocalExtensionCache::kCacheReadyFlagFileName);
-    EXPECT_EQ(base::WriteFile(cache_init_file, "", 0), 0);
-  }
-
   // Owned by DiskMountManager.
   KioskFakeDiskMountManager* fake_disk_mount_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(KioskUpdateTest);
 };
 
 IN_PROC_BROWSER_TEST_F(KioskUpdateTest, PRE_LaunchOfflineEnabledAppNoNetwork) {
   PreCacheAndLaunchApp(kTestOfflineEnabledKioskApp,
                        "1.0.0",
                        std::string(kTestOfflineEnabledKioskApp) + "_v1.crx");
@@ skipping 314 matching lines @@
 }
 
 IN_PROC_BROWSER_TEST_F(KioskUpdateTest, PRE_UpdateMultiAppKioskRemoveOneApp) {
   LaunchTestKioskAppWithTwoSecondaryApps();
 }
 
 // Update the primary app to version 2 which removes one of the secondary app
 // from its manifest.
 IN_PROC_BROWSER_TEST_F(KioskUpdateTest, UpdateMultiAppKioskRemoveOneApp) {
   set_test_app_id(kTestPrimaryKioskApp);
-  fake_cws()->SetUpdateCrx(
-      kTestPrimaryKioskApp,
-      std::string(kTestPrimaryKioskApp) + "-2.0.0-1app.crx", "2.0.0");
+  fake_cws()->SetUpdateCrx(kTestPrimaryKioskApp,
+                           std::string(kTestPrimaryKioskApp) + "-2.0.0.crx",
+                           "2.0.0");
   fake_cws()->SetNoUpdate(kTestSecondaryApp1);
   fake_cws()->SetNoUpdate(kTestSecondaryApp2);
 
   StartUIForAppLaunch();
   SimulateNetworkOnline();
   LaunchApp(test_app_id(), false);
   WaitForAppLaunchWithOptions(false, true);
 
   // Verify the secondary app kTestSecondaryApp1 is removed.
   EXPECT_EQ("2.0.0", GetInstalledAppVersion().GetString());
-  EXPECT_FALSE(IsAppInstalled(kTestSecondaryApp1));
-  EXPECT_TRUE(IsAppInstalled(kTestSecondaryApp2));
+  EXPECT_FALSE(IsAppInstalled(kTestSecondaryApp1, "1.0.0"));
+  EXPECT_TRUE(IsAppInstalled(kTestSecondaryApp2, "1.0.0"));
 }
 
 IN_PROC_BROWSER_TEST_F(KioskUpdateTest, PRE_UpdateMultiAppKioskAddOneApp) {
   LaunchTestKioskAppWithTwoSecondaryApps();
 }
 
 // Update the primary app to version 3 which adds a new secondary app in its
 // manifest.
 IN_PROC_BROWSER_TEST_F(KioskUpdateTest, UpdateMultiAppKioskAddOneApp) {
   set_test_app_id(kTestPrimaryKioskApp);
-  fake_cws()->SetUpdateCrx(
-      kTestPrimaryKioskApp,
-      std::string(kTestPrimaryKioskApp) + "-3.0.0-3app.crx", "3.0.0");
+  fake_cws()->SetUpdateCrx(kTestPrimaryKioskApp,
+                           std::string(kTestPrimaryKioskApp) + "-3.0.0.crx",
+                           "3.0.0");
   fake_cws()->SetNoUpdate(kTestSecondaryApp1);
   fake_cws()->SetNoUpdate(kTestSecondaryApp2);
   fake_cws()->SetUpdateCrx(kTestSecondaryApp3,
                            std::string(kTestSecondaryApp3) + "-1.0.0.crx",
                            "1.0.0");
 
   StartUIForAppLaunch();
   SimulateNetworkOnline();
   LaunchApp(test_app_id(), false);
   WaitForAppLaunchWithOptions(false, true);
 
   // Verify the secondary app kTestSecondaryApp3 is installed.
   EXPECT_EQ("3.0.0", GetInstalledAppVersion().GetString());
-  EXPECT_TRUE(IsAppInstalled(kTestSecondaryApp1));
-  EXPECT_TRUE(IsAppInstalled(kTestSecondaryApp2));
-  EXPECT_TRUE(IsAppInstalled(kTestSecondaryApp3));
+  EXPECT_TRUE(IsAppInstalled(kTestSecondaryApp1, "1.0.0"));
+  EXPECT_TRUE(IsAppInstalled(kTestSecondaryApp2, "1.0.0"));
+  EXPECT_TRUE(IsAppInstalled(kTestSecondaryApp3, "1.0.0"));
 }
 
 IN_PROC_BROWSER_TEST_F(KioskUpdateTest, LaunchKioskAppWithSecondaryExtension) {
   LaunchTestKioskAppWithSeconadayExtension();
 }
 
 IN_PROC_BROWSER_TEST_F(KioskUpdateTest,
                        LaunchAppWithSharedModuleAndSecondaryApp) {
   LaunchAppWithSharedModuleAndSecondaryApp();
 }
@@ skipping 11 matching lines @@
       std::string(kTestSharedModulePrimaryApp) + "-2.0.0.crx", "2.0.0");
   fake_cws()->SetNoUpdate(kTestSecondaryApp1);
   fake_cws()->SetNoUpdate(kTestSharedModuleId);
 
   StartUIForAppLaunch();
   SimulateNetworkOnline();
   LaunchApp(test_app_id(), false);
   WaitForAppLaunchWithOptions(false, true);
 
   // Verify the secondary app is removed.
-  EXPECT_TRUE(IsAppInstalled(kTestSharedModuleId));
-  EXPECT_FALSE(IsAppInstalled(kTestSecondaryApp1));
+  EXPECT_TRUE(IsAppInstalled(kTestSharedModuleId, "1.0.0"));
+  EXPECT_FALSE(IsAppInstalled(kTestSecondaryApp1, "1.0.0"));
 }
 
 // This simulates the stand-alone ARC kiosk app case. The primary app has a
 // shared ARC runtime but no secondary apps.
 IN_PROC_BROWSER_TEST_F(KioskUpdateTest, LaunchAppWithSharedModuleNoSecondary) {
-  TestAppInfo primary_app(
-      kTestSharedModulePrimaryApp, "2.0.0",
-      std::string(kTestSharedModulePrimaryApp) + "-2.0.0.crx",
-      extensions::Manifest::TYPE_PLATFORM_APP);
+  LaunchAppWithSharedModule();
+}
 
-  std::vector<TestAppInfo> secondary_apps;
-  // Setting up FakeCWS for shared module is the same for shared module as
-  // for kiosk secondary apps.
-  TestAppInfo shared_module(kTestSharedModuleId, "1.0.0",
-                            std::string(kTestSharedModuleId) + "-1.0.0.crx",
-                            extensions::Manifest::TYPE_SHARED_MODULE);
-  secondary_apps.push_back(shared_module);
+IN_PROC_BROWSER_TEST_F(KioskUpdateTest, PRE_LaunchAppWithUpdatedModule) {
+  LaunchAppWithSharedModule();
+  // Verify the shared module is installed with version 1.0.0.
+  EXPECT_TRUE(IsAppInstalled(kTestSharedModuleId, "1.0.0"));
+}
 
-  LaunchKioskWithSecondaryApps(primary_app, secondary_apps);
+// This simulates the case the shared module is updated to a newer version.
+// See crbug.com/555083.
+IN_PROC_BROWSER_TEST_F(KioskUpdateTest, LaunchAppWithUpdatedModule) {
+  // No update for primary app, while the shared module is set up to a new
+  // version on cws.
+  set_test_app_id(kTestSharedModulePrimaryApp);
+  fake_cws()->SetNoUpdate(kTestSharedModulePrimaryApp);
+  fake_cws()->SetUpdateCrx(kTestSharedModuleId,
+                           std::string(kTestSharedModuleId) + "-2.0.0.crx",
+                           "2.0.0");
+
+  StartUIForAppLaunch();
+  SimulateNetworkOnline();
+  LaunchApp(test_app_id(), false);
+  WaitForAppLaunchWithOptions(false, true);
+
+  // Verify the shared module is updated to the new version after primary app
+  // is launched.
+  EXPECT_TRUE(IsAppInstalled(kTestSharedModuleId, "2.0.0"));
 }
 
 IN_PROC_BROWSER_TEST_F(KioskUpdateTest,
                        LaunchAppWithSecondaryArcLikeAppAndExtension) {
   TestAppInfo primary_app(
       kTestSharedModulePrimaryApp, "3.0.0",
       std::string(kTestSharedModulePrimaryApp) + "-3.0.0.crx",
       extensions::Manifest::TYPE_PLATFORM_APP);
 
   std::vector<TestAppInfo> secondary_apps;
@@ skipping 257 matching lines @@
   content::WindowedNotificationObserver(
       chrome::NOTIFICATION_KIOSK_AUTOLAUNCH_WARNING_VISIBLE,
       content::NotificationService::AllSources()).Wait();
 
   // Wait for the wallpaper to load.
   WaitForWallpaper();
   EXPECT_TRUE(wallpaper_loaded());
 }
 
 }  // namespace chromeos