Decouple Cache Storage messaging from Service Worker/Embedded Worker

content/browser/service_worker/cache_storage_context_impl.h

Index: content/browser/service_worker/cache_storage_context_impl.h
diff --git a/content/browser/service_worker/cache_storage_context_impl.h b/content/browser/service_worker/cache_storage_context_impl.h
new file mode 100644
index 0000000000000000000000000000000000000000..98e87597453d820e8d3f625be9c808233a5c9558
--- /dev/null
+++ b/content/browser/service_worker/cache_storage_context_impl.h
@@ -0,0 +1,88 @@
+// Copyright 2015 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_SERVICE_WORKER_CACHE_STORAGE_CONTEXT_IMPL_H_
+#define CONTENT_BROWSER_SERVICE_WORKER_CACHE_STORAGE_CONTEXT_IMPL_H_
+
+#include "base/files/file_path.h"
+#include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
+#include "content/common/content_export.h"
+#include "content/public/browser/cache_storage_context.h"
+
+namespace base {
+class FilePath;
+class SequencedTaskRunner;
+}
+
+namespace net {
+class URLRequestContextGetter;
+}
+
+namespace storage {
+class QuotaManagerProxy;
+class SpecialStoragePolicy;
+}
+
+namespace content {
+
+class BrowserContext;
+class ChromeBlobStorageContext;
+class ServiceWorkerCacheStorageManager;
+
+// One instance of this exists per StoragePartition, and services multiple
+// child processes/origins. Most logic is delegated to the owned
+// ServiceWorkerCacheStorageManager instance, which is only accessed on the IO
+// thread.
+class CONTENT_EXPORT CacheStorageContextImpl
+    : NON_EXPORTED_BASE(public CacheStorageContext),
+      public base::RefCountedThreadSafe<CacheStorageContextImpl> {
+ public:
+  explicit CacheStorageContextImpl(BrowserContext* browser_context);
+
+  // Init and Shutdown are for use on the UI thread when the profile,
+  // storagepartition is being setup and torn down.
+  void Init(const base::FilePath& user_data_directory,
+            storage::QuotaManagerProxy* quota_manager_proxy,
+            storage::SpecialStoragePolicy* special_storage_policy);
+  void Shutdown();
+
+  // Only callable on the IO thread.
+  ServiceWorkerCacheStorageManager* cache_manager() const;
+
+  bool is_incognito() const { return is_incognito_; }
+
+  // The URLRequestContext doesn't exist until after the StoragePartition is
+  // made (which is after this object is made). This function must be called
+  // after this object is created but before any ServiceWorkerCache operations.
+  // It must be called on the IO thread. If either parameter is NULL the
+  // function immediately returns without forwarding to the
+  // ServiceWorkerCacheStorageManager.
+  void SetBlobParametersForCache(
+      net::URLRequestContextGetter* request_context,
+      ChromeBlobStorageContext* blob_storage_context);
+
+ private:
+  friend class base::RefCountedThreadSafe<CacheStorageContextImpl>;
+
+  ~CacheStorageContextImpl() override;
+
+  void CreateCacheStorageManager(
+      const base::FilePath& user_data_directory,
+      const scoped_refptr<base::SequencedTaskRunner>& cache_task_runner,
+      storage::QuotaManagerProxy* quota_manager_proxy,
+      storage::SpecialStoragePolicy* special_storage_policy);
+
+  void ShutdownOnIO();
+
+  // Initialized in Init(); true if the user data directory is empty.
+  bool is_incognito_ = false;

[kinuko, 2015/03/12 10:57:25]

Yay we're now in c++11 world :)

+
+  // Only accessed on the IO thread.
+  scoped_ptr<ServiceWorkerCacheStorageManager> cache_manager_;
+};
+
+}  // namespace content
+
+#endif  // CONTENT_BROWSER_SERVICE_WORKER_CACHE_STORAGE_CONTEXT_IMPL_H_