Refactored app cache clear on exit code to happen in the object owning the files.

webkit/appcache/appcache_storage_impl.h

Index: webkit/appcache/appcache_storage_impl.h
diff --git a/webkit/appcache/appcache_storage_impl.h b/webkit/appcache/appcache_storage_impl.h
index 584862aa72730bf9a4425ac6c46ebfe119d66b54..725188ac6a792ef66e4f0386d93f6cc35fbddc80 100644
--- a/webkit/appcache/appcache_storage_impl.h
+++ b/webkit/appcache/appcache_storage_impl.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -52,6 +52,14 @@ class AppCacheStorageImpl : public AppCacheStorage {
       const GURL& manifest_url, const std::vector<int64>& response_ids);
   virtual void PurgeMemory();
 
+ protected:

[michaeln, 2011/01/07 19:56:52]

oh wait... why have these new protected data members. Could you just make the
friend declarations and otherwise not change the interface. It's ok to have the
test poke into the private section.

[pastarmovj, 2011/01/10 11:02:01]

Sorry forgot to move this back to private I was experimenting with some stuff
before that.

+  AppCacheDiskCache* disk_cache();
+  // Used by the ChromeAppCacheService unit tests.
+  AppCacheDatabase* database() { return database_; }
+
+  FRIEND_TEST_ALL_PREFIXES(ChromeAppCacheServiceTest, KeepOnDestruction);
+  FRIEND_TEST_ALL_PREFIXES(ChromeAppCacheServiceTest, RemoveOnDestruction);
+
  private:
   friend class AppCacheStorageImplTest;
 
@@ -112,8 +120,6 @@ class AppCacheStorageImpl : public AppCacheStorage {
       const GURL& fallback_url, const AppCacheEntry& fallback_entry,
       int64 cache_id, const GURL& manifest_url);
 
-  AppCacheDiskCache* disk_cache();
-
   // The directory in which we place files in the file system.
   FilePath cache_directory_;
   scoped_refptr<base::MessageLoopProxy> cache_thread_;