Clear the ephemeral app cache from Clear Browsing Data

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/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 81 matching lines @@
   ExtensionService* service = ExtensionSystem::Get(browser()->profile())
       ->extension_service();
   ASSERT_TRUE(service);
   EXPECT_FALSE(service->GetInstalledExtension(inactive_app_id));
   EXPECT_TRUE(service->GetInstalledExtension(active_app_id));
 
   EXPECT_EQ(1, ephemeral_service->ephemeral_app_count());
 }
 
 // Verify that the count of ephemeral apps is maintained correctly.
-IN_PROC_BROWSER_TEST_F(EphemeralAppServiceBrowserTest,
-                       EphemeralAppCount) {
+IN_PROC_BROWSER_TEST_F(EphemeralAppServiceBrowserTest, EphemeralAppCount) {
   EphemeralAppService* ephemeral_service =
       EphemeralAppService::Get(browser()->profile());
   ASSERT_TRUE(ephemeral_service);
   InitEphemeralAppCount(ephemeral_service);
 
   // The count should not increase for regular installed apps.
   EXPECT_TRUE(InstallPlatformApp("minimal"));
   EXPECT_EQ(0, ephemeral_service->ephemeral_app_count());
 
   // The count should increase when an ephemeral app is added.
   const Extension* app = InstallEphemeralApp(kMessagingReceiverApp);
   ASSERT_TRUE(app);
   EXPECT_EQ(1, ephemeral_service->ephemeral_app_count());
 
   // The count should remain constant if the ephemeral app is updated.
   const std::string app_id = app->id();
   app = UpdateEphemeralApp(
       app_id, GetTestPath(kMessagingReceiverAppV2),
       GetTestPath(kMessagingReceiverApp).ReplaceExtension(
           FILE_PATH_LITERAL(".pem")));
   ASSERT_TRUE(app);
   EXPECT_EQ(1, ephemeral_service->ephemeral_app_count());
 
   // The count should decrease when an ephemeral app is promoted to a regular
   // installed app.
   PromoteEphemeralApp(app);
   EXPECT_EQ(0, ephemeral_service->ephemeral_app_count());
 }
+
+// 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);
+
+  EphemeralAppService* ephemeral_service =
+      EphemeralAppService::Get(browser()->profile());
+  ASSERT_TRUE(ephemeral_service);
+  ephemeral_service->ClearCachedApps();

[tapted, 2014/07/11 01:16:36]

before this, perhaps EXPECT_EQ(2, ephemeral_service->ephemeral_app_count());

[tmdiep, 2014/07/11 03:11:43]

Done.

+
+  ExtensionService* service =
+      ExtensionSystem::Get(browser()->profile())->extension_service();

[tapted, 2014/07/11 01:16:36]

nit: I think you're inheriting an `extension_service()` helper function from
ExtensionBrowserTest, which can simplify this

[tmdiep, 2014/07/11 03:11:43]

Updated to use ExtensionRegistry since the function is deprecated.

+  ASSERT_TRUE(service);
+  EXPECT_FALSE(service->GetInstalledExtension(inactive_app_id));
+  EXPECT_TRUE(service->GetInstalledExtension(running_app_id));
+
+  EXPECT_EQ(1, ephemeral_service->ephemeral_app_count());
+}