AppCaches which belong to hosted apps are not protected from deletion

webkit/appcache/appcache_service.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 "webkit/appcache/appcache_service.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/stl_util-inl.h"
 #include "webkit/appcache/appcache_backend_impl.h"
@@ skipping 92 matching lines @@
   CallCallback(can ? net::OK : net::ERR_FAILED);
   delete this;
 }
 
 // DeleteHelper -------
 
 class AppCacheService::DeleteHelper : public AsyncHelper {
  public:
   DeleteHelper(
       AppCacheService* service, const GURL& manifest_url,
-      net::CompletionCallback* callback)
-      : AsyncHelper(service, callback), manifest_url_(manifest_url) {
+      net::CompletionCallback* callback, bool sync)
+      : AsyncHelper(service, callback), manifest_url_(manifest_url),
+        sync_(sync) {
   }
 
   virtual void Start() {
-    service_->storage()->LoadOrCreateGroup(manifest_url_, this);
+    if (sync_)
+      service_->storage()->SyncLoadOrCreateGroup(manifest_url_, this);
+    else
+      service_->storage()->LoadOrCreateGroup(manifest_url_, this);
   }
 
  private:
   // AppCacheStorage::Delegate methods
   virtual void OnGroupLoaded(
       appcache::AppCacheGroup* group, const GURL& manifest_url);
   virtual void OnGroupMadeObsolete(
       appcache::AppCacheGroup* group, bool success);
 
   GURL manifest_url_;
+  bool sync_;
+
   DISALLOW_COPY_AND_ASSIGN(DeleteHelper);
 };
 
 void AppCacheService::DeleteHelper::OnGroupLoaded(
       appcache::AppCacheGroup* group, const GURL& manifest_url) {
   if (group) {
     group->set_being_deleted(true);
     group->CancelUpdate();
-    service_->storage()->MakeGroupObsolete(group, this);
+    if (sync_)
+      service_->storage()->SyncMakeGroupObsolete(group, this);
+    else
+      service_->storage()->MakeGroupObsolete(group, this);
   } else {
-    CallCallback(net::ERR_FAILED);
+    if (!sync_)
+      CallCallback(net::ERR_FAILED);
     delete this;
   }
 }
 
 void AppCacheService::DeleteHelper::OnGroupMadeObsolete(
       appcache::AppCacheGroup* group, bool success) {
-  CallCallback(success ? net::OK : net::ERR_FAILED);
+  if (!sync_)
+    CallCallback(success ? net::OK : net::ERR_FAILED);
   delete this;
 }
 
 // DeleteOriginHelper -------
 
 class AppCacheService::DeleteOriginHelper : public AsyncHelper {
  public:
   DeleteOriginHelper(
       AppCacheService* service, const GURL& origin,
       net::CompletionCallback* callback)
@@ skipping 79 matching lines @@
   delete this;
 }
 
 
 // GetInfoHelper -------
 
 class AppCacheService::GetInfoHelper : AsyncHelper {
  public:
   GetInfoHelper(
       AppCacheService* service, AppCacheInfoCollection* collection,
-      net::CompletionCallback* callback)
-      : AsyncHelper(service, callback), collection_(collection) {
+      net::CompletionCallback* callback, bool sync)
+      : AsyncHelper(service, callback), collection_(collection), sync_(sync) {
   }
 
   virtual void Start() {
-    service_->storage()->GetAllInfo(this);
+    if (sync_)
+      service_->storage()->SyncGetAllInfo(this);
+    else
+      service_->storage()->GetAllInfo(this);
   }
 
  private:
   // AppCacheStorage::Delegate override
   virtual void OnAllInfo(AppCacheInfoCollection* collection);
 
   scoped_refptr<AppCacheInfoCollection> collection_;
+  bool sync_;
+
   DISALLOW_COPY_AND_ASSIGN(GetInfoHelper);
 };
 
 void AppCacheService::GetInfoHelper::OnAllInfo(
       AppCacheInfoCollection* collection) {
   if (collection)
     collection->infos_by_origin.swap(collection_->infos_by_origin);
-  CallCallback(collection ? net::OK : net::ERR_FAILED);
+  if (!sync_)
+    CallCallback(collection ? net::OK : net::ERR_FAILED);
   delete this;
 }
 
 
 // AppCacheService -------
 
 AppCacheService::AppCacheService(quota::QuotaManagerProxy* quota_manager_proxy)
     : appcache_policy_(NULL), quota_client_(NULL),
       quota_manager_proxy_(quota_manager_proxy),
       request_context_(NULL)  {
@@ skipping 25 matching lines @@
     const GURL& url,
     net::CompletionCallback* callback) {
   CanHandleOfflineHelper* helper =
       new CanHandleOfflineHelper(this, url, callback);
   helper->Start();
 }
 
 void AppCacheService::GetAllAppCacheInfo(AppCacheInfoCollection* collection,
                                          net::CompletionCallback* callback) {
   DCHECK(collection);
-  GetInfoHelper* helper = new GetInfoHelper(this, collection, callback);
+  GetInfoHelper* helper = new GetInfoHelper(this, collection, callback, false);
+  helper->Start();
+}
+
+void AppCacheService::SyncGetAllAppCacheInfo(
+    AppCacheInfoCollection* collection) {
+  DCHECK(collection);
+  GetInfoHelper* helper = new GetInfoHelper(this, collection, NULL, true);
   helper->Start();
 }
 
 void AppCacheService::DeleteAppCacheGroup(const GURL& manifest_url,
                                           net::CompletionCallback* callback) {
-  DeleteHelper* helper = new DeleteHelper(this, manifest_url, callback);
+  DeleteHelper* helper = new DeleteHelper(this, manifest_url, callback, false);
   helper->Start();
 }
 
+void AppCacheService::SyncDeleteAppCacheGroup(const GURL& manifest_url) {
+  DeleteHelper* helper = new DeleteHelper(this, manifest_url, NULL, true);
+  helper->Start();
+}
+
 void AppCacheService::DeleteAppCachesForOrigin(
     const GURL& origin,  net::CompletionCallback* callback) {
   DeleteOriginHelper* helper = new DeleteOriginHelper(this, origin, callback);
   helper->Start();
 }
 
 void AppCacheService::set_special_storage_policy(
     quota::SpecialStoragePolicy* policy) {
   special_storage_policy_ = policy;
 }
 
 void AppCacheService::RegisterBackend(
     AppCacheBackendImpl* backend_impl) {
   DCHECK(backends_.find(backend_impl->process_id()) == backends_.end());
   backends_.insert(
       BackendMap::value_type(backend_impl->process_id(), backend_impl));
 }
 
 void AppCacheService::UnregisterBackend(
     AppCacheBackendImpl* backend_impl) {
   backends_.erase(backend_impl->process_id());
 }
 
 }  // namespace appcache