AppCaches which belong to hosted apps are not protected from deletion

webkit/appcache/appcache_storage_impl_unittest.cc

 // Copyright (c) 2011 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 <stack>
 
 #include "base/message_loop.h"
 #include "base/threading/thread.h"
 #include "base/synchronization/waitable_event.h"
 #include "net/base/net_errors.h"
@@ skipping 448 matching lines @@
     AppCacheDatabase::GroupRecord record;
     EXPECT_FALSE(database()->FindGroup(
         delegate()->loaded_group_->group_id(), &record));
 
     EXPECT_EQ(0, mock_quota_manager_proxy_->notify_storage_accessed_count_);
     EXPECT_EQ(0, mock_quota_manager_proxy_->notify_storage_modified_count_);
 
     TestFinished();
   }
 
+  void CreateGroupSyncInPopulatedOrigin() {
+    storage()->usage_map_[kOrigin] = kDefaultEntrySize;
+
+    storage()->SyncLoadOrCreateGroup(kManifestUrl, delegate());
+    Verify_CreateGroup();
+  }
+
   // LoadGroupAndCache_FarHit  --------------------------------------
 
   void LoadGroupAndCache_FarHit() {
     // Attempt to load a cache that is not currently in use
     // and does require loading from disk. This
     // load should complete asyncly.
     PushNextTask(NewRunnableMethod(
        this, &AppCacheStorageImplTest::Verify_LoadCache_Far_Hit));
 
     // Setup some preconditions. Create a group and newest cache that
@@ skipping 227 matching lines @@
     EXPECT_FALSE(database()->FindCache(cache_->cache_id(), &cache_record));
 
     EXPECT_EQ(0, mock_quota_manager_proxy_->notify_storage_accessed_count_);
     EXPECT_EQ(0, mock_quota_manager_proxy_->notify_storage_modified_count_);
 
     TestFinished();
   }
 
   // MakeGroupObsolete  -------------------------------
 
-  void MakeGroupObsolete() {
-    // Make a group obsolete, should complete asyncly.
-    PushNextTask(NewRunnableMethod(
-       this, &AppCacheStorageImplTest::Verify_MakeGroupObsolete));
-
+  void Setup_MakeGroupObsolete() {
     // Setup some preconditions. Create a group and newest cache that
     // appears to be "stored" and "currently in use".
     MakeCacheAndGroup(kManifestUrl, 1, 1, true);
     EXPECT_EQ(kDefaultEntrySize, storage()->usage_map_[kOrigin]);
 
     // Also insert some related records.
     AppCacheDatabase::EntryRecord entry_record;
     entry_record.cache_id = 1;
     entry_record.flags = AppCacheEntry::FALLBACK;
     entry_record.response_id = 1;
     entry_record.url = kEntryUrl;
     EXPECT_TRUE(database()->InsertEntry(&entry_record));
 
     AppCacheDatabase::FallbackNameSpaceRecord fallback_namespace_record;
     fallback_namespace_record.cache_id = 1;
     fallback_namespace_record.fallback_entry_url = kEntryUrl;
     fallback_namespace_record.namespace_url = kFallbackNamespace;
     fallback_namespace_record.origin = kManifestUrl.GetOrigin();
     EXPECT_TRUE(
         database()->InsertFallbackNameSpace(&fallback_namespace_record));
 
     AppCacheDatabase::OnlineWhiteListRecord online_whitelist_record;
     online_whitelist_record.cache_id = 1;
     online_whitelist_record.namespace_url = kOnlineNamespace;
     EXPECT_TRUE(database()->InsertOnlineWhiteList(&online_whitelist_record));
+  }
+
+  void MakeGroupObsolete() {
+    // Make a group obsolete, should complete asyncly.
+    PushNextTask(NewRunnableMethod(
+       this, &AppCacheStorageImplTest::Verify_MakeGroupObsolete));
+    Setup_MakeGroupObsolete();
 
     // Conduct the test.
     storage()->MakeGroupObsolete(group_, delegate());
     EXPECT_FALSE(group_->is_obsolete());
   }
 
+  void SyncMakeGroupObsolete() {
+    Setup_MakeGroupObsolete();
+    // Conduct the test.
+    storage()->SyncMakeGroupObsolete(group_, delegate());
+    Verify_MakeGroupObsolete();
+  }
+
   void Verify_MakeGroupObsolete() {
     EXPECT_TRUE(delegate()->obsoleted_success_);
     EXPECT_EQ(group_.get(), delegate()->obsoleted_group_.get());
     EXPECT_TRUE(group_->is_obsolete());
     EXPECT_TRUE(storage()->usage_map_.empty());
 
     // The cache and group have been deleted from the database.
     AppCacheDatabase::GroupRecord group_record;
     AppCacheDatabase::CacheRecord cache_record;
     EXPECT_FALSE(database()->FindGroup(1, &group_record));
@@ skipping 566 matching lines @@
 }
 
 TEST_F(AppCacheStorageImplTest, CreateGroupInEmptyOrigin) {
   RunTestOnIOThread(&AppCacheStorageImplTest::CreateGroupInEmptyOrigin);
 }
 
 TEST_F(AppCacheStorageImplTest, CreateGroupInPopulatedOrigin) {
   RunTestOnIOThread(&AppCacheStorageImplTest::CreateGroupInPopulatedOrigin);
 }
 
+TEST_F(AppCacheStorageImplTest, CreateGroupSyncInPopulatedOrigin) {
+  RunTestOnIOThread(&AppCacheStorageImplTest::CreateGroupSyncInPopulatedOrigin);
+}
+
 TEST_F(AppCacheStorageImplTest, LoadGroupAndCache_FarHit) {
   RunTestOnIOThread(&AppCacheStorageImplTest::LoadGroupAndCache_FarHit);
 }
 
 TEST_F(AppCacheStorageImplTest, StoreNewGroup) {
   RunTestOnIOThread(&AppCacheStorageImplTest::StoreNewGroup);
 }
 
 TEST_F(AppCacheStorageImplTest, StoreExistingGroup) {
   RunTestOnIOThread(&AppCacheStorageImplTest::StoreExistingGroup);
 }
 
 TEST_F(AppCacheStorageImplTest, StoreExistingGroupExistingCache) {
   RunTestOnIOThread(&AppCacheStorageImplTest::StoreExistingGroupExistingCache);
 }
 
 TEST_F(AppCacheStorageImplTest, FailStoreGroup) {
   RunTestOnIOThread(&AppCacheStorageImplTest::FailStoreGroup);
 }
 
 TEST_F(AppCacheStorageImplTest, MakeGroupObsolete) {
   RunTestOnIOThread(&AppCacheStorageImplTest::MakeGroupObsolete);
 }
 
+TEST_F(AppCacheStorageImplTest, SyncMakeGroupObsolete) {
+  RunTestOnIOThread(&AppCacheStorageImplTest::SyncMakeGroupObsolete);
+}
+
 TEST_F(AppCacheStorageImplTest, MarkEntryAsForeign) {
   RunTestOnIOThread(&AppCacheStorageImplTest::MarkEntryAsForeign);
 }
 
 TEST_F(AppCacheStorageImplTest, MarkEntryAsForeignWithLoadInProgress) {
   RunTestOnIOThread(
       &AppCacheStorageImplTest::MarkEntryAsForeignWithLoadInProgress);
 }
 
 TEST_F(AppCacheStorageImplTest, FindNoMainResponse) {
@@ skipping 40 matching lines @@
       &AppCacheStorageImplTest::FindMainResponseExclusionsInWorkingSet);
 }
 
 // That's all folks!
 
 }  // namespace appcache
 
 // AppCacheStorageImplTest is expected to always live longer than the
 // runnable methods.  This lets us call NewRunnableMethod on its instances.
 DISABLE_RUNNABLE_METHOD_REFCOUNT(appcache::AppCacheStorageImplTest);