Remove the ability to retain local data of evicted ephemeral apps

chrome/browser/extensions/extension_util.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 "chrome/browser/extensions/extension_util.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 231 matching lines @@
   if (!extension.get())
     return false;
 
   return AppIsolationInfo::HasIsolatedStorage(extension.get());
 }
 
 bool SiteHasIsolatedStorage(const GURL& extension_site_url,
                             content::BrowserContext* context) {
   const Extension* extension = ExtensionRegistry::Get(context)->
       enabled_extensions().GetExtensionOrAppByURL(extension_site_url);
-  if (extension)
-    return AppIsolationInfo::HasIsolatedStorage(extension);
+  if (!extension)
+    return false;
 
-  if (extension_site_url.SchemeIs(kExtensionScheme)) {
-    // The site URL may also be from an evicted ephemeral app. We do not
-    // immediately delete their data when they are removed from extension
-    // system.
-    ExtensionPrefs* prefs = ExtensionPrefs::Get(context);
-    DCHECK(prefs);
-    scoped_ptr<ExtensionInfo> info = prefs->GetEvictedEphemeralAppInfo(
-        extension_site_url.host());
-    if (info.get())
-      return HasIsolatedStorage(*info);
-  }
-
-  return false;
+  return AppIsolationInfo::HasIsolatedStorage(extension);
 }
 
 const gfx::ImageSkia& GetDefaultAppIcon() {
   return *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
       IDR_APP_DEFAULT_ICON);
 }
 
 const gfx::ImageSkia& GetDefaultExtensionIcon() {
   return *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
       IDR_EXTENSION_DEFAULT_ICON);
 }
 
 }  // namespace util
 }  // namespace extensions