Remove the ability to retain local data of evicted ephemeral apps

chrome/browser/apps/ephemeral_app_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_APPS_EPHEMERAL_APP_SERVICE_H_
 #define CHROME_BROWSER_APPS_EPHEMERAL_APP_SERVICE_H_
 
 #include <map>
 #include <set>
 
@@ skipping 27 matching lines @@
 
   // Constants exposed for testing purposes:
 
   // The number of days of inactivity before an ephemeral app will be removed.
   static const int kAppInactiveThreshold;
   // If the ephemeral app has been launched within this number of days, it will
   // definitely not be garbage collected.
   static const int kAppKeepThreshold;
   // The maximum number of ephemeral apps to keep cached. Excess may be removed.
   static const int kMaxEphemeralAppsCount;
-  // The number of days of inactivity before the data of an already evicted
-  // ephemeral app will be removed.
-  static const int kDataInactiveThreshold;

[benwells, 2014/06/18 00:21:47]

If we just change the value of this constant, would we get the same behavior but
keep the flexibility of having different timeouts?

[tmdiep, 2014/06/18 01:04:57]

Not identical as the data garbage collection only occurred at startup, but it
can be easily triggered to run when ephemeral apps get evicted as well.

The motivation of reverting the patch was to reduce the complexity of the all
the code changes needed to support it.

 
  private:
   // A map used to order the ephemeral apps by their last launch time.
   typedef std::multimap<base::Time, std::string> LaunchTimeAppMap;
 
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
@@ skipping 11 matching lines @@
   void Init();
   void InitEphemeralAppCount();
 
   // Garbage collect ephemeral apps.
   void TriggerGarbageCollect(const base::TimeDelta& delay);
   void GarbageCollectApps();
   static void GetAppsToRemove(int app_count,
                               const LaunchTimeAppMap& app_launch_times,
                               std::set<std::string>* remove_app_ids);
 
-  // Garbage collect the data of ephemeral apps that have been evicted and
-  // inactive for a long period of time.
-  void GarbageCollectData();
-
   Profile* profile_;
 
   content::NotificationRegistrar registrar_;
-
   ScopedObserver<extensions::ExtensionRegistry,
                  extensions::ExtensionRegistryObserver>
       extension_registry_observer_;
 
   base::OneShotTimer<EphemeralAppService> garbage_collect_apps_timer_;
-  base::OneShotTimer<EphemeralAppService> garbage_collect_data_timer_;
 
   // The count of cached ephemeral apps.
   int ephemeral_app_count_;
 
-  friend class EphemeralAppBrowserTest;
   friend class EphemeralAppServiceTest;
   friend class EphemeralAppServiceBrowserTest;
 
   DISALLOW_COPY_AND_ASSIGN(EphemeralAppService);
 };
 
 #endif  // CHROME_BROWSER_APPS_EPHEMERAL_APP_SERVICE_H_