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

webkit/appcache/appcache_storage_impl.h

-// 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.
 
 #ifndef WEBKIT_APPCACHE_APPCACHE_STORAGE_IMPL_H_
 #define WEBKIT_APPCACHE_APPCACHE_STORAGE_IMPL_H_
 
 #include <deque>
 #include <map>
 #include <set>
 #include <vector>
@@ skipping 33 matching lines @@
   virtual AppCacheResponseReader* CreateResponseReader(
       const GURL& manifest_url, int64 response_id);
   virtual AppCacheResponseWriter* CreateResponseWriter(
       const GURL& manifest_url);
   virtual void DoomResponses(
       const GURL& manifest_url, const std::vector<int64>& response_ids);
   virtual void DeleteResponses(
       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;
 
   // The AppCacheStorageImpl class methods and datamembers may only be
   // accessed on the IO thread. This class manufactures seperate DatabaseTasks
   // which access the DB on a seperate background thread.
   class DatabaseTask;
   class InitTask;
   class CloseConnectionTask;
   class DisableDatabaseTask;
@@ skipping 40 matching lines @@
       const GURL& url, AppCacheEntry found_entry,
       scoped_refptr<AppCacheGroup> group, scoped_refptr<AppCache> newest_cache,
       scoped_refptr<DelegateReference> delegate_ref);
 
   void CheckPolicyAndCallOnMainResponseFound(
       DelegateReferenceVector* delegates,
       const GURL& url, const AppCacheEntry& entry,
       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_;
   bool is_incognito_;
 
   // Structures to keep track of DatabaseTasks that are in-flight.
   DatabaseTaskQueue scheduled_database_tasks_;
   PendingCacheLoads pending_cache_loads_;
   PendingGroupLoads pending_group_loads_;
   PendingForeignMarkings pending_foreign_markings_;
@@ skipping 22 matching lines @@
   // Used to short-circuit certain operations without having to schedule
   // any tasks on the background database thread.
   std::set<GURL> origins_with_groups_;
   std::deque<Task*> pending_simple_tasks_;
   ScopedRunnableMethodFactory<AppCacheStorageImpl> method_factory_;
 };
 
 }  // namespace appcache
 
 #endif  // WEBKIT_APPCACHE_APPCACHE_STORAGE_IMPL_H_