Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / content / browser / service_worker / service_worker_context_core.h

diff --git a/src/content/browser/service_worker/service_worker_context_core.h b/src/content/browser/service_worker/service_worker_context_core.h
index 11ee722..83ef2f6 100644 (file)
--- a/src/content/browser/service_worker/service_worker_context_core.h
+++ b/src/content/browser/service_worker/service_worker_context_core.h
@@ -25,15 +25,15 @@ class GURL;
 
 namespace base {
 class FilePath;
-class MessageLoopProxy;
 class SequencedTaskRunner;
+class SingleThreadTaskRunner;
 }
 
 namespace net {
 class URLRequestContext;
 }
 
-namespace quota {
+namespace storage {
 class QuotaManagerProxy;
 }
 
@@ -97,10 +97,10 @@ class CONTENT_EXPORT ServiceWorkerContextCore
   // be called on the thread which called AddObserver() of |observer_list|.
   ServiceWorkerContextCore(
       const base::FilePath& user_data_directory,
-      base::SequencedTaskRunner* cache_task_runner,
-      base::SequencedTaskRunner* database_task_runner,
-      base::MessageLoopProxy* disk_cache_thread,
-      quota::QuotaManagerProxy* quota_manager_proxy,
+      const scoped_refptr<base::SequencedTaskRunner>& cache_task_runner,
+      const scoped_refptr<base::SequencedTaskRunner>& database_task_runner,
+      const scoped_refptr<base::SingleThreadTaskRunner>& disk_cache_thread,
+      storage::QuotaManagerProxy* quota_manager_proxy,
       ObserverListThreadSafe<ServiceWorkerContextObserver>* observer_list,
       ServiceWorkerContextWrapper* wrapper);
   ServiceWorkerContextCore(
@@ -145,11 +145,9 @@ class CONTENT_EXPORT ServiceWorkerContextCore
 
   // A child process of |source_process_id| may be used to run the created
   // worker for initial installation.
-  // Non-null |provider_host| must be given if this is called from a document,
-  // whose process_id() must match with |source_process_id|.
+  // Non-null |provider_host| must be given if this is called from a document.
   void RegisterServiceWorker(const GURL& pattern,
                              const GURL& script_url,
-                             int source_process_id,
                              ServiceWorkerProviderHost* provider_host,
                              const RegistrationCallback& callback);
   void UnregisterServiceWorker(const GURL& pattern,
@@ -180,7 +178,7 @@ class CONTENT_EXPORT ServiceWorkerContextCore
 
   void SetBlobParametersForCache(
       net::URLRequestContext* request_context,
-      base::WeakPtr<webkit_blob::BlobStorageContext> blob_storage_context);
+      base::WeakPtr<storage::BlobStorageContext> blob_storage_context);
 
   base::WeakPtr<ServiceWorkerContextCore> AsWeakPtr() {
     return weak_factory_.GetWeakPtr();