Expire appcaches that fail to update for "too long".

content/browser/appcache/appcache_database.h

 // Copyright (c) 2012 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 CONTENT_BROWSER_APPCACHE_APPCACHE_DATABASE_H_
 #define CONTENT_BROWSER_APPCACHE_APPCACHE_DATABASE_H_
 
 #include <map>
 #include <set>
 #include <vector>
@@ skipping 13 matching lines @@
 class Statement;
 class StatementID;
 }
 
 namespace content {
 FORWARD_DECLARE_TEST(AppCacheDatabaseTest, CacheRecords);
 FORWARD_DECLARE_TEST(AppCacheDatabaseTest, EntryRecords);
 FORWARD_DECLARE_TEST(AppCacheDatabaseTest, QuickIntegrityCheck);
 FORWARD_DECLARE_TEST(AppCacheDatabaseTest, NamespaceRecords);
 FORWARD_DECLARE_TEST(AppCacheDatabaseTest, GroupRecords);
+FORWARD_DECLARE_TEST(AppCacheDatabaseTest, GroupAccessAndEvictionTimes);
 FORWARD_DECLARE_TEST(AppCacheDatabaseTest, LazyOpen);
 FORWARD_DECLARE_TEST(AppCacheDatabaseTest, ExperimentalFlags);
 FORWARD_DECLARE_TEST(AppCacheDatabaseTest, OnlineWhiteListRecords);
 FORWARD_DECLARE_TEST(AppCacheDatabaseTest, ReCreate);
 FORWARD_DECLARE_TEST(AppCacheDatabaseTest, DeletableResponseIds);
 FORWARD_DECLARE_TEST(AppCacheDatabaseTest, OriginUsage);
-FORWARD_DECLARE_TEST(AppCacheDatabaseTest, UpgradeSchema3to5);
-FORWARD_DECLARE_TEST(AppCacheDatabaseTest, UpgradeSchema4to5);
+FORWARD_DECLARE_TEST(AppCacheDatabaseTest, UpgradeSchema3to7);
+FORWARD_DECLARE_TEST(AppCacheDatabaseTest, UpgradeSchema4to7);
+FORWARD_DECLARE_TEST(AppCacheDatabaseTest, UpgradeSchema5or6to7);
 FORWARD_DECLARE_TEST(AppCacheDatabaseTest, WasCorrutionDetected);
 class AppCacheDatabaseTest;
 class AppCacheStorageImplTest;
 
 class CONTENT_EXPORT AppCacheDatabase {
  public:
   struct CONTENT_EXPORT GroupRecord {
     GroupRecord();
     ~GroupRecord();
 
     int64 group_id;
     GURL origin;
     GURL manifest_url;
     base::Time creation_time;
     base::Time last_access_time;
+    base::Time last_full_update_check_time;
+    base::Time first_evictable_error_time;
   };
 
   struct CONTENT_EXPORT CacheRecord {
     CacheRecord()
         : cache_id(0), group_id(0), online_wildcard(false), cache_size(0) {}
 
     int64 cache_id;
     int64 group_id;
     bool online_wildcard;
     base::Time update_time;
@@ skipping 42 matching lines @@
   bool FindOriginsWithGroups(std::set<GURL>* origins);
   bool FindLastStorageIds(
       int64* last_group_id, int64* last_cache_id, int64* last_response_id,
       int64* last_deletable_response_rowid);
 
   bool FindGroup(int64 group_id, GroupRecord* record);
   bool FindGroupForManifestUrl(const GURL& manifest_url, GroupRecord* record);
   bool FindGroupsForOrigin(
       const GURL& origin, std::vector<GroupRecord>* records);
   bool FindGroupForCache(int64 cache_id, GroupRecord* record);
-  bool UpdateLastAccessTime(
-      int64 group_id, base::Time last_access_time);
-  bool LazyUpdateLastAccessTime(
-      int64 group_id, base::Time last_access_time);
-  bool CommitLazyLastAccessTimes();  // The destructor calls this too.
   bool InsertGroup(const GroupRecord* record);
   bool DeleteGroup(int64 group_id);
 
+  // The access and eviction time update methods do not fail when
+  // given invalid groupids. The return value only indicates whether
+  // the database is functioning.
+  bool UpdateLastAccessTime(int64 group_id,
+                            base::Time last_access_time);
+  bool LazyUpdateLastAccessTime(int64 group_id,
+                                base::Time last_access_time);
+  bool UpdateEvictionTimes(int64 group_id,
+                           base::Time last_full_update_check_time,
+                           base::Time first_evictable_error_time);
+  bool CommitLazyLastAccessTimes();  // The destructor calls this too.
+
   bool FindCache(int64 cache_id, CacheRecord* record);
   bool FindCacheForGroup(int64 group_id, CacheRecord* record);
   bool FindCachesForOrigin(
       const GURL& origin, std::vector<CacheRecord>* records);
   bool InsertCache(const CacheRecord* record);
   bool DeleteCache(int64 cache_id);
 
   bool FindEntriesForCache(
       int64 cache_id, std::vector<EntryRecord>* records);
   bool FindEntriesForUrl(
@@ skipping 92 matching lines @@
   bool was_corruption_detected_;
 
   friend class content::AppCacheDatabaseTest;
   friend class content::AppCacheStorageImplTest;
 
   FRIEND_TEST_ALL_PREFIXES(content::AppCacheDatabaseTest, CacheRecords);
   FRIEND_TEST_ALL_PREFIXES(content::AppCacheDatabaseTest, EntryRecords);
   FRIEND_TEST_ALL_PREFIXES(content::AppCacheDatabaseTest, QuickIntegrityCheck);
   FRIEND_TEST_ALL_PREFIXES(content::AppCacheDatabaseTest, NamespaceRecords);
   FRIEND_TEST_ALL_PREFIXES(content::AppCacheDatabaseTest, GroupRecords);
+  FRIEND_TEST_ALL_PREFIXES(content::AppCacheDatabaseTest,
+                           GroupAccessAndEvictionTimes);
   FRIEND_TEST_ALL_PREFIXES(content::AppCacheDatabaseTest, LazyOpen);
   FRIEND_TEST_ALL_PREFIXES(content::AppCacheDatabaseTest, ExperimentalFlags);
   FRIEND_TEST_ALL_PREFIXES(content::AppCacheDatabaseTest,
                            OnlineWhiteListRecords);
   FRIEND_TEST_ALL_PREFIXES(content::AppCacheDatabaseTest, ReCreate);
   FRIEND_TEST_ALL_PREFIXES(content::AppCacheDatabaseTest, DeletableResponseIds);
   FRIEND_TEST_ALL_PREFIXES(content::AppCacheDatabaseTest, OriginUsage);
-  FRIEND_TEST_ALL_PREFIXES(content::AppCacheDatabaseTest, UpgradeSchema3to5);
-  FRIEND_TEST_ALL_PREFIXES(content::AppCacheDatabaseTest, UpgradeSchema4to5);
+  FRIEND_TEST_ALL_PREFIXES(content::AppCacheDatabaseTest, UpgradeSchema3to7);
+  FRIEND_TEST_ALL_PREFIXES(content::AppCacheDatabaseTest, UpgradeSchema4to7);
+  FRIEND_TEST_ALL_PREFIXES(content::AppCacheDatabaseTest, UpgradeSchema5or6to7);
   FRIEND_TEST_ALL_PREFIXES(content::AppCacheDatabaseTest, WasCorrutionDetected);
 
   DISALLOW_COPY_AND_ASSIGN(AppCacheDatabase);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_APPCACHE_APPCACHE_DATABASE_H_