Disable ephemeral apps after they stop running

chrome/browser/apps/ephemeral_app_service_browsertest.cc

 // Copyright 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 "chrome/browser/apps/ephemeral_app_browsertest.h"
 #include "chrome/browser/apps/ephemeral_app_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/test/test_utils.h"
@@ skipping 31 matching lines @@
     EphemeralAppService* ephemeral_service = EphemeralAppService::Get(
         browser()->profile());
     ASSERT_TRUE(ephemeral_service);
     ephemeral_service->GarbageCollectApps();
   }
 
   void InitEphemeralAppCount(EphemeralAppService* ephemeral_service) {
     ephemeral_service->InitEphemeralAppCount();
   }
 
+  void UnloadEphemeralAppsOnStartup() {
+    EphemeralAppService* ephemeral_service =
+        EphemeralAppService::Get(browser()->profile());
+    ASSERT_TRUE(ephemeral_service);
+    ephemeral_service->UnloadEphemeralAppsOnStartup();
+  }
+
   std::vector<std::string> app_ids_;
 };
 
 // Verifies that inactive ephemeral apps are uninstalled and active apps are
 // not removed. Extensive testing of the ephemeral app cache's replacement
 // policies is done in the unit tests for EphemeralAppService. This is more
 // like an integration test.
 IN_PROC_BROWSER_TEST_F(EphemeralAppServiceBrowserTest,
                        GarbageCollectInactiveApps) {
   EphemeralAppService* ephemeral_service =
@@ skipping 69 matching lines @@
 
 // Verify that the cache of ephemeral apps is correctly cleared. Running apps
 // should not be removed.
 IN_PROC_BROWSER_TEST_F(EphemeralAppServiceBrowserTest, ClearCachedApps) {
   const Extension* running_app =
       InstallAndLaunchEphemeralApp(kMessagingReceiverApp);
   const Extension* inactive_app =
       InstallAndLaunchEphemeralApp(kDispatchEventTestApp);
   std::string inactive_app_id = inactive_app->id();
   std::string running_app_id = running_app->id();
-  CloseApp(inactive_app_id);
+  CloseAppWaitForUnload(inactive_app_id);
 
   EphemeralAppService* ephemeral_service =
       EphemeralAppService::Get(browser()->profile());
   ASSERT_TRUE(ephemeral_service);
   EXPECT_EQ(2, ephemeral_service->ephemeral_app_count());
 
   ephemeral_service->ClearCachedApps();
 
   ExtensionRegistry* registry = ExtensionRegistry::Get(profile());
   ASSERT_TRUE(registry);
   EXPECT_FALSE(registry->GetExtensionById(inactive_app_id,
                                           ExtensionRegistry::EVERYTHING));
   EXPECT_TRUE(registry->GetExtensionById(running_app_id,
                                          ExtensionRegistry::EVERYTHING));
 
   EXPECT_EQ(1, ephemeral_service->ephemeral_app_count());
 }
+
+// Verify that the service will unload and disable ephemeral apps on startup.
+IN_PROC_BROWSER_TEST_F(EphemeralAppServiceBrowserTest,
+                       UnloadEphemeralAppsOnStartup) {
+  const Extension* installed_app = InstallPlatformApp(kNotificationsTestApp);
+  const Extension* running_app =
+      InstallAndLaunchEphemeralApp(kMessagingReceiverApp);
+  const Extension* inactive_app = InstallEphemeralApp(kDispatchEventTestApp);
+  ASSERT_TRUE(installed_app);
+  ASSERT_TRUE(running_app);
+  ASSERT_TRUE(inactive_app);
+
+  ExtensionRegistry* registry = ExtensionRegistry::Get(profile());
+  DCHECK(registry);
+  EXPECT_TRUE(registry->enabled_extensions().Contains(installed_app->id()));
+  EXPECT_TRUE(registry->enabled_extensions().Contains(running_app->id()));
+  EXPECT_TRUE(registry->enabled_extensions().Contains(inactive_app->id()));
+
+  UnloadEphemeralAppsOnStartup();
+
+  // Verify that the inactive app is disabled.
+  EXPECT_TRUE(registry->enabled_extensions().Contains(installed_app->id()));
+  EXPECT_TRUE(registry->enabled_extensions().Contains(running_app->id()));
+  EXPECT_TRUE(registry->disabled_extensions().Contains(inactive_app->id()));
+}