Revert of 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"
 
 namespace content {
 
 ServiceWorkerContextWrapper::ServiceWorkerContextWrapper(
     BrowserContext* browser_context)
@@ skipping 150 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,
-    const ResultCallback& result) {
+void ServiceWorkerContextWrapper::DeleteForOrigin(const GURL& origin_url) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  context_core_->UnregisterServiceWorkers(
-      origin_url, base::Bind(&StatusCodeToBoolCallbackAdapter, result));
+  context_core_->storage()->GetAllRegistrations(base::Bind(
+      &ServiceWorkerContextWrapper::DidGetAllRegistrationsForDeleteForOrigin,
+      this,
+      origin_url));
 }
 
-void ServiceWorkerContextWrapper::DeleteForOrigin(const GURL& origin_url) {
-  DeleteForOrigin(origin_url, base::Bind(&EmptySuccessCallback));
+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::AddObserver(
     ServiceWorkerContextObserver* observer) {
   observer_list_->AddObserver(observer);
 }
 
 void ServiceWorkerContextWrapper::RemoveObserver(
     ServiceWorkerContextObserver* observer) {
   observer_list_->RemoveObserver(observer);
@@ skipping 24 matching lines @@
         base::Bind(&ServiceWorkerContextWrapper::InitInternal,
                    this,
                    user_data_directory,
                    stores_task_runner,
                    database_task_runner,
                    disk_cache_thread,
                    make_scoped_refptr(quota_manager_proxy)));
     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_runner,
                                                    disk_cache_thread,
                                                    quota_manager_proxy,
                                                    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