Disable ephemeral apps after they stop running

chrome/browser/apps/ephemeral_app_launcher_browsertest.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 "base/message_loop/message_loop_proxy.h"
 #include "chrome/browser/apps/ephemeral_app_launcher.h"
+#include "chrome/browser/apps/ephemeral_app_service.h"
 #include "chrome/browser/extensions/extension_install_checker.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/extensions/install_tracker.h"
 #include "chrome/browser/extensions/test_blacklist.h"
 #include "chrome/browser/extensions/webstore_installer_test.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/extension_util.h"
 #include "extensions/browser/management_policy.h"
+#include "extensions/common/switches.h"
 
 using extensions::Extension;
 using extensions::ExtensionPrefs;
 using extensions::ExtensionRegistry;
 using extensions::ExtensionSystem;
 using extensions::InstallTracker;
 namespace webstore_install = extensions::webstore_install;
 
 namespace {
 
@@ skipping 155 matching lines @@
   EphemeralAppLauncherTest()
       : WebstoreInstallerTest(kWebstoreDomain,
                               kTestDataPath,
                               kDefaultAppCrxFilename,
                               kAppDomain,
                               kNonAppDomain) {}
 
   virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE {
     WebstoreInstallerTest::SetUpCommandLine(command_line);
 
+    // Make event pages get suspended immediately.
+    command_line->AppendSwitchASCII(extensions::switches::kEventPageIdleTime,
+                                    "10");
+    command_line->AppendSwitchASCII(
+        extensions::switches::kEventPageSuspendingTime, "10");
+
     // Enable ephemeral apps flag.
     command_line->AppendSwitch(switches::kEnableEphemeralApps);
   }
 
+  virtual void SetUpOnMainThread() OVERRIDE {
+    WebstoreInstallerTest::SetUpOnMainThread();
+
+    // Disable ephemeral apps immediately after they stop running in tests.
+    EphemeralAppService::Get(profile())->set_disable_delay_for_test(0);
+  }
+
   base::FilePath GetTestPath(const char* test_name) {
     return test_data_dir_.AppendASCII("platform_apps/ephemeral_launcher")
         .AppendASCII(test_name);
   }
 
   const Extension* GetInstalledExtension(const std::string& id) {
     return ExtensionRegistry::Get(profile())
         ->GetExtensionById(id, ExtensionRegistry::EVERYTHING);
   }
 
@@ skipping 51 matching lines @@
   }
 
   const Extension* InstallAndDisableApp(
       const char* test_path,
       Extension::DisableReason disable_reason) {
     const Extension* app = InstallExtension(GetTestPath(test_path), 1);
     EXPECT_TRUE(app);
     if (!app)
       return NULL;
 
-    if (disable_reason == Extension::DISABLE_GREYLIST) {
-      ExtensionPrefs::Get(profile())->SetExtensionBlacklistState(
-          app->id(), extensions::BLACKLISTED_MALWARE);
-    }
-
     ExtensionService* service =
         ExtensionSystem::Get(profile())->extension_service();
     service->DisableExtension(app->id(), disable_reason);
 
     if (disable_reason == Extension::DISABLE_PERMISSIONS_INCREASE) {
       // When an extension is disabled due to a permissions increase, this
       // flag needs to be set too, for some reason.
       ExtensionPrefs::Get(profile())
           ->SetDidExtensionEscalatePermissions(app, true);
     }
 
-    EXPECT_FALSE(
-        ExtensionRegistry::Get(profile())->enabled_extensions().Contains(
+    EXPECT_TRUE(
+        ExtensionRegistry::Get(profile())->disabled_extensions().Contains(
             app->id()));
     return app;
   }
 };
 
 class EphemeralAppLauncherTestDisabled : public EphemeralAppLauncherTest {
  public:
   virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE {
     // Skip EphemeralAppLauncherTest as it enables the feature.
     WebstoreInstallerTest::SetUpCommandLine(command_line);
   }
 };
 
 // Verifies that an ephemeral app will not be installed and launched if the
 // feature is disabled.
 IN_PROC_BROWSER_TEST_F(EphemeralAppLauncherTestDisabled, FeatureDisabled) {
   RunLaunchTest(
       kDefaultAppCrxFilename, webstore_install::LAUNCH_FEATURE_DISABLED, false);
   EXPECT_FALSE(GetInstalledExtension(kDefaultAppId));
 }
 
 // Verifies that an app with no permission warnings will be installed
 // ephemerally and launched without prompting the user.
 IN_PROC_BROWSER_TEST_F(EphemeralAppLauncherTest,
                        LaunchAppWithNoPermissionWarnings) {
+  content::WindowedNotificationObserver unloaded_signal(
+      extensions::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED,
+      content::Source<Profile>(profile()));
+
   scoped_refptr<EphemeralAppLauncherForTest> launcher(
       new EphemeralAppLauncherForTest(kDefaultAppId, profile()));
   StartLauncherAndCheckResult(launcher.get(), webstore_install::SUCCESS, true);
   ValidateAppInstalledEphemerally(kDefaultAppId);
 
   // Apps with no permission warnings should not result in a prompt.
   EXPECT_FALSE(launcher->install_prompt_created());
 
+  // Ephemeral apps are unloaded after they stop running.
+  unloaded_signal.Wait();
+
   // After an app has been installed ephemerally, it can be launched again
   // without installing from the web store.
   RunLaunchTest(kDefaultAppId, webstore_install::SUCCESS, false);
 }
 
 // Verifies that an app with permission warnings will be installed
 // ephemerally and launched if accepted by the user.
 IN_PROC_BROWSER_TEST_F(EphemeralAppLauncherTest,
                        LaunchAppWithPermissionsWarnings) {
   SetCrxFilename(kAppWithPermissionsFilename);
@@ skipping 170 matching lines @@
   ManagementPolicyMock policy;
   ExtensionSystem::Get(profile())->management_policy()->RegisterProvider(
       &policy);
   ExtensionSystem::Get(profile())->extension_service()->CheckManagementPolicy();
 
   RunLaunchTest(app->id(), webstore_install::BLOCKED_BY_POLICY, false);
 }
 
 // Verifies that an installed blacklisted app cannot be launched.
 IN_PROC_BROWSER_TEST_F(EphemeralAppLauncherTest, LaunchBlacklistedApp) {
-  const Extension* app =
-      InstallAndDisableApp(kDefaultAppTestPath, Extension::DISABLE_GREYLIST);
+  const Extension* app = InstallExtension(GetTestPath(kDefaultAppTestPath), 1);
   ASSERT_TRUE(app);
 
+  ExtensionService* service =
+      ExtensionSystem::Get(profile())->extension_service();
+  service->BlacklistExtensionForTest(app->id());
+  ASSERT_TRUE(
+      ExtensionRegistry::Get(profile())->blacklisted_extensions().Contains(
+          app->id()));
+
   RunLaunchTest(app->id(), webstore_install::BLACKLISTED, false);
 }
 
 // Verifies that an installed app with unsupported requirements cannot be
 // launched.
 IN_PROC_BROWSER_TEST_F(EphemeralAppLauncherTest,
                        LaunchAppWithUnsupportedRequirements) {
   const Extension* app = InstallAndDisableApp(
       kDefaultAppTestPath, Extension::DISABLE_UNSUPPORTED_REQUIREMENT);
   ASSERT_TRUE(app);
@@ skipping 10 matching lines @@
 }
 
 // Verifies that a launch will fail if a duplicate launch is in progress.
 IN_PROC_BROWSER_TEST_F(EphemeralAppLauncherTest, DuplicateLaunchInProgress) {
   extensions::ActiveInstallData install_data(kDefaultAppId);
   install_data.is_ephemeral = true;
   InstallTracker::Get(profile())->AddActiveInstall(install_data);
 
   RunLaunchTest(kDefaultAppId, webstore_install::LAUNCH_IN_PROGRESS, false);
 }