Remove the Extensions URLRequestContext

content/browser/storage_partition_impl.h

Index: content/browser/storage_partition_impl.h
diff --git a/content/browser/storage_partition_impl.h b/content/browser/storage_partition_impl.h
index 8665a74b34ccc4397f36b83961f2762efaad384a..a8027c31fbe0086a34678b903f289c5d16993c3e 100644
--- a/content/browser/storage_partition_impl.h
+++ b/content/browser/storage_partition_impl.h
@@ -12,6 +12,7 @@
 #include "content/browser/dom_storage/dom_storage_context_wrapper.h"
 #include "content/browser/indexed_db/indexed_db_context_impl.h"
 #include "content/browser/media/webrtc_identity_store.h"
+#include "content/browser/net/cookie_store_map_impl.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/storage_partition.h"
 
@@ -31,12 +32,10 @@ class StoragePartitionImpl : public StoragePartition {
   virtual webkit_database::DatabaseTracker* GetDatabaseTracker() OVERRIDE;
   virtual DOMStorageContextWrapper* GetDOMStorageContext() OVERRIDE;
   virtual IndexedDBContextImpl* GetIndexedDBContext() OVERRIDE;
-
   virtual void ClearDataForOrigin(
       uint32 remove_mask,
       uint32 quota_storage_remove_mask,
-      const GURL& storage_origin,
-      net::URLRequestContextGetter* request_context_getter) OVERRIDE;
+      const GURL& storage_origin) OVERRIDE;
   virtual void ClearDataForUnboundedRange(
       uint32 remove_mask,
       uint32 quota_storage_remove_mask) OVERRIDE;
@@ -47,6 +46,7 @@ class StoragePartitionImpl : public StoragePartition {
                                  const base::Closure& callback) OVERRIDE;
 
   WebRTCIdentityStore* GetWebRTCIdentityStore();
+  const CookieStoreMapImpl& GetCookieStoreMap();
 
   struct DataDeletionHelper;
   struct QuotaManagedDataDeletionHelper;
@@ -61,9 +61,11 @@ class StoragePartitionImpl : public StoragePartition {
   // 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);
+  static StoragePartitionImpl* Create(
+      BrowserContext* context,
+      bool in_memory,
+      const base::FilePath& profile_path,
+      scoped_ptr<CookieStoreMapImpl> cookie_store_map);
 
   // Quota managed data uses a different bitmask for types than
   // StoragePartition uses. This method generates that mask.
@@ -77,12 +79,13 @@ class StoragePartitionImpl : public StoragePartition {
       webkit_database::DatabaseTracker* database_tracker,
       DOMStorageContextWrapper* dom_storage_context,
       IndexedDBContextImpl* indexed_db_context,
+      scoped_ptr<CookieStoreMapImpl> cookie_store_map,
       scoped_ptr<WebRTCIdentityStore> webrtc_identity_store);
 
+  // Use an empty |remove_origin| to delete data from all origins.
   void ClearDataImpl(uint32 remove_mask,
                      uint32 quota_storage_remove_mask,
                      const GURL& remove_origin,
-                     net::URLRequestContextGetter* rq_context,
                      const base::Time begin,
                      const base::Time end,
                      const base::Closure& callback);
@@ -112,6 +115,7 @@ class StoragePartitionImpl : public StoragePartition {
   scoped_refptr<webkit_database::DatabaseTracker> database_tracker_;
   scoped_refptr<DOMStorageContextWrapper> dom_storage_context_;
   scoped_refptr<IndexedDBContextImpl> indexed_db_context_;
+  scoped_ptr<CookieStoreMapImpl> cookie_store_map_;
   scoped_ptr<WebRTCIdentityStore> webrtc_identity_store_;
 
   DISALLOW_COPY_AND_ASSIGN(StoragePartitionImpl);