Keep track of ServiceWorkerContext's BrowserContext and expose it.

content/browser/storage_partition_impl.h

 // Copyright (c) 2012 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_STORAGE_PARTITION_IMPL_H_
 #define CONTENT_BROWSER_STORAGE_PARTITION_IMPL_H_
 
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
@@ skipping 47 matching lines @@
   void ClearData(uint32 remove_mask,
                  uint32 quota_storage_remove_mask,
                  const GURL& storage_origin,
                  const OriginMatcherFunction& origin_matcher,
                  const base::Time begin,
                  const base::Time end,
                  const base::Closure& callback) override;
 
   WebRTCIdentityStore* GetWebRTCIdentityStore();
 
+  BrowserContext* browser_context() const;
+
   struct DataDeletionHelper;
   struct QuotaManagedDataDeletionHelper;
 
  private:
   friend class StoragePartitionImplMap;
   FRIEND_TEST_ALL_PREFIXES(StoragePartitionShaderClearTest, ClearShaderCache);
   FRIEND_TEST_ALL_PREFIXES(StoragePartitionImplTest,
                            RemoveQuotaManagedDataForeverBoth);
   FRIEND_TEST_ALL_PREFIXES(StoragePartitionImplTest,
                            RemoveQuotaManagedDataForeverOnlyTemporary);
@@ skipping 28 matching lines @@
   // StoragePartition's on-disk storage.
   //
   // If |in_memory| is true, the |partition_path| is (ab)used as a way of
   // distinguishing different in-memory partitions, but nothing is persisted
   // on to disk.
   static StoragePartitionImpl* Create(BrowserContext* context,
                                       bool in_memory,
                                       const base::FilePath& profile_path);
 
   CONTENT_EXPORT StoragePartitionImpl(
+      BrowserContext* browser_context,
       const base::FilePath& partition_path,
       storage::QuotaManager* quota_manager,
       ChromeAppCacheService* appcache_service,
       storage::FileSystemContext* filesystem_context,
       storage::DatabaseTracker* database_tracker,
       DOMStorageContextWrapper* dom_storage_context,
       IndexedDBContextImpl* indexed_db_context,
       ServiceWorkerContextWrapper* service_worker_context,
       WebRTCIdentityStore* webrtc_identity_store,
       storage::SpecialStoragePolicy* special_storage_policy,
@@ skipping 36 matching lines @@
   scoped_refptr<storage::DatabaseTracker> database_tracker_;
   scoped_refptr<DOMStorageContextWrapper> dom_storage_context_;
   scoped_refptr<IndexedDBContextImpl> indexed_db_context_;
   scoped_refptr<ServiceWorkerContextWrapper> service_worker_context_;
   scoped_refptr<WebRTCIdentityStore> webrtc_identity_store_;
   scoped_refptr<storage::SpecialStoragePolicy> special_storage_policy_;
   scoped_refptr<GeofencingManager> geofencing_manager_;
   scoped_refptr<HostZoomLevelContext> host_zoom_level_context_;
   scoped_refptr<NavigatorConnectContext> navigator_connect_context_;
 
+  // Weak pointer that should always be valid. The BrowserContext owns the

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

"Raw pointer" is more accurate since it's not a WeakPtr<>.

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

Done.

+  // StoragePartitionImplMap which then owns StoragePartitionImpl. When the
+  // BrowserContext is destroyed, |this| will be destroyed too.
+  BrowserContext* browser_context_;
+
   DISALLOW_COPY_AND_ASSIGN(StoragePartitionImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_STORAGE_PARTITION_IMPL_H_