AppCaches which belong to hosted apps are not protected from deletion

content/browser/appcache/chrome_appcache_service.h

 // 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 CONTENT_BROWSER_APPCACHE_CHROME_APPCACHE_SERVICE_H_
 #define CONTENT_BROWSER_APPCACHE_CHROME_APPCACHE_SERVICE_H_
 #pragma once
 
 #include "base/memory/ref_counted.h"
+#include "base/synchronization/waitable_event.h"
 #include "content/browser/browser_thread.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
+#include "net/base/completion_callback.h"
 #include "webkit/appcache/appcache_policy.h"
 #include "webkit/appcache/appcache_service.h"
 #include "webkit/quota/special_storage_policy.h"
 
 class FilePath;
 
+namespace appcache {
+class TestableChromeAppCacheService;
+}
+
 namespace content {
 class ResourceContext;
 }
 
 // An AppCacheService subclass used by the chrome. There is an instance
 // associated with each Profile. This derivation adds refcounting semantics
 // since a profile has multiple URLRequestContexts which refer to the same
 // object, and those URLRequestContexts are refcounted independently of the
 // owning profile.
 //
 // All methods, except the ctor, are expected to be called on
 // the IO thread (unless specifically called out in doc comments).
 class ChromeAppCacheService
     : public base::RefCountedThreadSafe<ChromeAppCacheService,
                                         BrowserThread::DeleteOnIOThread>,
       public appcache::AppCacheService,
       public appcache::AppCachePolicy,
       public NotificationObserver {
  public:
   explicit ChromeAppCacheService(quota::QuotaManagerProxy* proxy);
 
   void InitializeOnIOThread(
       const FilePath& cache_path,  // may be empty to use in-memory structures
       const content::ResourceContext* resource_context,
-      scoped_refptr<quota::SpecialStoragePolicy> special_storage_policy,
-      bool clear_local_state_on_exit);
+      scoped_refptr<quota::SpecialStoragePolicy> special_storage_policy);
 
-  void SetClearLocalStateOnExit(bool clear_local_state);
+  // Safe to call from any thread
+  base::WaitableEvent* ClearAppCache(net::CompletionCallback* callback);
 
  private:
   friend class BrowserThread;
   friend class DeleteTask<ChromeAppCacheService>;
+  // TestableChromeAppService is a subclass of ChromeAppCacheService used in the
+  // unit tests

[michaeln, 2011/07/02 00:29:09]

i'd nuke this comment, i think it's stating the obvious

[marja(google), 2011/07/13 11:06:59]

Done.

+  friend class appcache::TestableChromeAppCacheService;
+
+  class ClearAppcacheHelper {

[michaeln, 2011/07/02 00:29:09]

This class seems heavier weight than it needs to be for what it does... consider
just CACS->AddRef() and CACS->Release() at the new/delete callsites of this
object instead of having a new class/object.

[marja(google), 2011/07/13 11:06:59]

Done.

+  public:
+    ClearAppcacheHelper(ChromeAppCacheService* parent,
+                        net::CompletionCallback* callback);
+    ~ClearAppcacheHelper();
+    void OnClearedAppCache();
+  private:
+    scoped_refptr<ChromeAppCacheService> parent_;
+    net::CompletionCallback* callback_;
+  };
 
   virtual ~ChromeAppCacheService();
 
   // AppCachePolicy overrides
   virtual bool CanLoadAppCache(const GURL& manifest_url);
   virtual int CanCreateAppCache(const GURL& manifest_url,
                                 net::CompletionCallback* callback);
 
   // NotificationObserver override
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
+  // Appcache clearing helpers and callbacks

[michaeln, 2011/07/02 00:29:09]

AppCache with an upper 'C' is more in keeping with the existing names thruout
the project.

[marja(google), 2011/07/13 11:06:59]

Done.

+  void OnGotAppCacheInfo(int rv);
+  void OnAppCacheDeleted(int rv);
+
   const content::ResourceContext* resource_context_;
   NotificationRegistrar registrar_;
-  bool clear_local_state_on_exit_;
   FilePath cache_path_;
+  ClearAppcacheHelper* clear_appcache_helper_;
+  net::CompletionCallbackImpl<ChromeAppCacheService>
+      appcache_got_info_callback_;
+  net::CompletionCallbackImpl<ChromeAppCacheService>
+      appcache_deleted_callback_;
+  scoped_refptr<appcache::AppCacheInfoCollection> appcache_info_;
+  int appcaches_to_be_deleted_count_;
+  scoped_ptr<base::WaitableEvent> appcaches_cleared_event_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeAppCacheService);
 };
 
 #endif  // CONTENT_BROWSER_APPCACHE_CHROME_APPCACHE_SERVICE_H_