Change threading in ServiceWorkerCacheStorage

content/browser/service_worker/service_worker_cache.h

 // Copyright 2014 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_SERVICE_WORKER_CACHE_H_
 #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_CACHE_H_
 
 #include "base/callback.h"
 #include "base/files/file_path.h"
+#include "base/memory/weak_ptr.h"
 
 namespace content {
 
 // TODO(jkarlin): Fill this in with a real Cache implementation as
 // specified in
 // https://slightlyoff.github.io/ServiceWorker/spec/service_worker/index.html.
 // TODO(jkarlin): Unload cache backend from memory once the cache object is no
 // longer referenced in javascript.
 
 // Represents a ServiceWorker Cache as seen in
 // https://slightlyoff.github.io/ServiceWorker/spec/service_worker/index.html.
 // InitializeIfNeeded must be called before calling the other public members.
 class ServiceWorkerCache {
  public:
-  static ServiceWorkerCache* CreateMemoryCache(const std::string& name);
-  static ServiceWorkerCache* CreatePersistentCache(const base::FilePath& path,
-                                                   const std::string& name);
+  static scoped_ptr<ServiceWorkerCache> CreateMemoryCache(

[michaeln, 2014/08/12 23:34:32]

nice change on the rv types

[jkarlin, 2014/08/12 23:52:55]

Acknowledged.

+      const std::string& name);
+  static scoped_ptr<ServiceWorkerCache> CreatePersistentCache(
+      const base::FilePath& path,
+      const std::string& name);
   virtual ~ServiceWorkerCache();
 
   // Loads the backend and calls the callback with the result (true for
   // success). This must be called before member functions that require a
   // backend are called.
   void CreateBackend(const base::Callback<void(bool)>& callback);
 
   void set_name(const std::string& name) { name_ = name; }
   const std::string& name() const { return name_; }
   int32 id() const { return id_; }
   void set_id(int32 id) { id_ = id; }
 
+  base::WeakPtr<ServiceWorkerCache> GetWeakPtr() {

[michaeln, 2014/08/12 23:34:32]

typicically a methods on classes that vend weakptrs to themselves are named
GetAsWeakPtr()

[jkarlin, 2014/08/12 23:52:55]

Done.

+    return weak_ptr_factory_.GetWeakPtr();
+  }
+
  private:
   ServiceWorkerCache(const base::FilePath& path, const std::string& name);
 
   base::FilePath path_;
   std::string name_;
   int32 id_;
 
+  base::WeakPtrFactory<ServiceWorkerCache> weak_ptr_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(ServiceWorkerCache);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_CACHE_H_