Added quota client for serviceworker. Enables 'clear past <time> data'.

content/browser/service_worker/service_worker_context_wrapper.cc

 // Copyright 2013 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 "content/browser/service_worker/service_worker_context_wrapper.h"
 
 #include <map>
 
+#include "base/barrier_closure.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "content/browser/fileapi/chrome_blob_storage_context.h"
 #include "content/browser/service_worker/service_worker_context_core.h"
 #include "content/browser/service_worker/service_worker_context_observer.h"
 #include "content/browser/service_worker/service_worker_process_manager.h"
+#include "content/browser/service_worker/service_worker_quota_client.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "storage/browser/blob/blob_storage_context.h"
 #include "storage/browser/quota/quota_manager_proxy.h"
 #include "storage/browser/quota/special_storage_policy.h"
 
 namespace content {
 
 ServiceWorkerContextWrapper::ServiceWorkerContextWrapper(
@@ skipping 68 matching lines @@
     BrowserThread::PostTask(
         BrowserThread::IO,
         FROM_HERE,
         base::Bind(&ServiceWorkerContextWrapper::RegisterServiceWorker,
                    this,
                    pattern,
                    script_url,
                    continuation));
     return;
   }
-
+  if (!context_core_.get()) {
+    LOG(ERROR) << "ServiceWorkerContextCore is no longer alive.";
+    BrowserThread::PostTask(
+        BrowserThread::IO,
+        FROM_HERE,
+        base::Bind(continuation, false));
+    return;
+  }
   context()->RegisterServiceWorker(
       pattern,
       script_url,
       NULL /* provider_host */,
       base::Bind(&FinishRegistrationOnIO, continuation));
 }
 
 static void FinishUnregistrationOnIO(
     const ServiceWorkerContext::ResultCallback& continuation,
     ServiceWorkerStatusCode status) {
@@ skipping 10 matching lines @@
   if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) {
     BrowserThread::PostTask(
         BrowserThread::IO,
         FROM_HERE,
         base::Bind(&ServiceWorkerContextWrapper::UnregisterServiceWorker,
                    this,
                    pattern,
                    continuation));
     return;
   }
+  if (!context_core_.get()) {
+    LOG(ERROR) << "ServiceWorkerContextCore is no longer alive.";
+    BrowserThread::PostTask(
+        BrowserThread::IO,
+        FROM_HERE,
+        base::Bind(continuation, false));
+    return;
+  }
 
   context()->UnregisterServiceWorker(
       pattern,
       base::Bind(&FinishUnregistrationOnIO, continuation));
 }
 
 void ServiceWorkerContextWrapper::Terminate() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   process_manager_->Shutdown();
 }
 
 void ServiceWorkerContextWrapper::GetAllOriginsInfo(
     const GetUsageInfoCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  context_core_->storage()->GetAllRegistrations(base::Bind(
+  if (!context_core_.get()) {
+    LOG(ERROR) << "ServiceWorkerContextCore is no longer alive.";
+    BrowserThread::PostTask(
+        BrowserThread::IO,
+        FROM_HERE,
+        base::Bind(callback, std::vector<ServiceWorkerUsageInfo>()));
+    return;
+  }
+  context()->storage()->GetAllRegistrations(base::Bind(
       &ServiceWorkerContextWrapper::DidGetAllRegistrationsForGetAllOrigins,
       this,
       callback));
 }
 
 void ServiceWorkerContextWrapper::DidGetAllRegistrationsForGetAllOrigins(
     const GetUsageInfoCallback& callback,
     const std::vector<ServiceWorkerRegistrationInfo>& registrations) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   std::vector<ServiceWorkerUsageInfo> usage_infos;
@@ skipping 16 matching lines @@
            origins.begin();
        it != origins.end();
        ++it) {
     usage_infos.push_back(it->second);
   }
 
   callback.Run(usage_infos);
 }
 
 namespace {
+void StatusCodeToBoolCallbackAdapter(
+    const ServiceWorkerContext::ResultCallback& callback,
+    ServiceWorkerStatusCode code) {
+  callback.Run(code == ServiceWorkerStatusCode::SERVICE_WORKER_OK);
+}
 
 void EmptySuccessCallback(bool success) {
 }
-
 }  // namespace
 
-void ServiceWorkerContextWrapper::DeleteForOrigin(const GURL& origin_url) {
+void ServiceWorkerContextWrapper::DeleteForOrigin(
+    const GURL& origin_url,
+    const ResultCallback& result) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  context_core_->storage()->GetAllRegistrations(base::Bind(
-      &ServiceWorkerContextWrapper::DidGetAllRegistrationsForDeleteForOrigin,
-      this,
-      origin_url));
+  if (!context_core_.get()) {
+    LOG(ERROR) << "ServiceWorkerContextCore is no longer alive.";
+    BrowserThread::PostTask(
+        BrowserThread::IO,
+        FROM_HERE,
+        base::Bind(result, false));
+    return;
+  }
+  context()->UnregisterServiceWorkers(
+      origin_url, base::Bind(&StatusCodeToBoolCallbackAdapter, result));
 }
 
-void ServiceWorkerContextWrapper::DidGetAllRegistrationsForDeleteForOrigin(
-    const GURL& origin,
-    const std::vector<ServiceWorkerRegistrationInfo>& registrations) {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-
-  for (std::vector<ServiceWorkerRegistrationInfo>::const_iterator it =
-           registrations.begin();
-       it != registrations.end();
-       ++it) {
-    const ServiceWorkerRegistrationInfo& registration_info = *it;
-    if (origin == registration_info.pattern.GetOrigin()) {
-      UnregisterServiceWorker(registration_info.pattern,
-                              base::Bind(&EmptySuccessCallback));
-    }
-  }
+void ServiceWorkerContextWrapper::DeleteForOrigin(const GURL& origin_url) {
+  DeleteForOrigin(origin_url, base::Bind(&EmptySuccessCallback));
 }
 
 void ServiceWorkerContextWrapper::AddObserver(
     ServiceWorkerContextObserver* observer) {
   observer_list_->AddObserver(observer);
 }
 
 void ServiceWorkerContextWrapper::RemoveObserver(
     ServiceWorkerContextObserver* observer) {
   observer_list_->RemoveObserver(observer);
@@ skipping 26 matching lines @@
                    this,
                    user_data_directory,
                    stores_task_runner,
                    base::Passed(&database_task_manager),
                    disk_cache_thread,
                    make_scoped_refptr(quota_manager_proxy),
                    make_scoped_refptr(special_storage_policy)));
     return;
   }
   DCHECK(!context_core_);
+  if (quota_manager_proxy) {
+    quota_manager_proxy->RegisterClient(new ServiceWorkerQuotaClient(this));
+  }
   context_core_.reset(new ServiceWorkerContextCore(user_data_directory,
                                                    stores_task_runner,
                                                    database_task_manager.Pass(),
                                                    disk_cache_thread,
                                                    quota_manager_proxy,
                                                    special_storage_policy,
                                                    observer_list_.get(),
                                                    this));
 }
 
 void ServiceWorkerContextWrapper::ShutdownOnIO() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   context_core_.reset();
 }
 
 void ServiceWorkerContextWrapper::DidDeleteAndStartOver(
     ServiceWorkerStatusCode status) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (status != SERVICE_WORKER_OK) {
     context_core_.reset();
     return;
   }
   context_core_.reset(new ServiceWorkerContextCore(context_core_.get(), this));
   DVLOG(1) << "Restarted ServiceWorkerContextCore successfully.";
 }
 
 }  // namespace content