Keep track of ServiceWorkerContext's BrowserContext and expose it.

content/browser/service_worker/service_worker_context_wrapper.h

 // 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.
 
 #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_CONTEXT_WRAPPER_H_
 #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_CONTEXT_WRAPPER_H_
 
 #include <vector>
 
 #include "base/files/file_path.h"
@@ skipping 17 matching lines @@
 class QuotaManagerProxy;
 class SpecialStoragePolicy;
 }
 
 namespace content {
 
 class BrowserContext;
 class ChromeBlobStorageContext;
 class ServiceWorkerContextCore;
 class ServiceWorkerContextObserver;
+class StoragePartitionImpl;
 
 // A refcounted wrapper class for our core object. Higher level content lib
 // classes keep references to this class on mutliple threads. The inner core
 // instance is strictly single threaded and is not refcounted, the core object
 // is what is used internally in the service worker lib.
 class CONTENT_EXPORT ServiceWorkerContextWrapper
     : NON_EXPORTED_BASE(public ServiceWorkerContext),
       public base::RefCountedThreadSafe<ServiceWorkerContextWrapper> {
  public:
   ServiceWorkerContextWrapper(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,
+  void Init(StoragePartitionImpl* storage_partition,
+            const base::FilePath& user_data_directory,
             storage::QuotaManagerProxy* quota_manager_proxy,
             storage::SpecialStoragePolicy* special_storage_policy);
   void Shutdown();
 
   // Deletes all files on disk and restarts the system asynchronously. This
   // leaves the system in a disabled state until it's done. This should be
   // called on the IO thread.
   void DeleteAndStartOver();
 
   // The core context is only for use on the IO thread.
   ServiceWorkerContextCore* context();
 
+  // The StoragePartition should only be used on the UI thread.

[michaeln, 2015/01/13 21:27:32]

Also say that it may be null before/during init and during/after shutdown.

[mlamouri (slow - plz ping), 2015/01/14 15:46:24]

Done.

+  StoragePartitionImpl* storage_partition() const;
+
   // The process manager can be used on either UI or IO.
   ServiceWorkerProcessManager* process_manager() {
     return process_manager_.get();
   }
 
   // ServiceWorkerContext implementation:
   void RegisterServiceWorker(const GURL& pattern,
                              const GURL& script_url,
                              const ResultCallback& continuation) override;
   void UnregisterServiceWorker(const GURL& pattern,
@@ skipping 49 matching lines @@
       const std::vector<ServiceWorkerRegistrationInfo>& registrations);
 
   const scoped_refptr<ObserverListThreadSafe<ServiceWorkerContextObserver> >
       observer_list_;
   const scoped_ptr<ServiceWorkerProcessManager> process_manager_;
   // Cleared in Shutdown():
   scoped_ptr<ServiceWorkerContextCore> context_core_;
 
   // Initialized in Init(); true if the user data directory is empty.
   bool is_incognito_;
+
+  // WeakPtr to the StoragePartitionImpl owning |this|.

[michaeln, 2015/01/13 21:27:32]

Actual use of the WeakPtr<> template here might help catch programming errors
that try to access it on the wrong thread.

[mlamouri (slow - plz ping), 2015/01/14 15:46:24]

I would prefer not to abuse WeakPtr<> in order to simply have a thread safe
object unless this is a common pattern already? Would that be interesting to add
such a wrapper in a follow-up? ie. something that would guarantee that object X
is only used on thread Y.

+  StoragePartitionImpl* storage_partition_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_CONTEXT_WRAPPER_H_