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 9dcdfeced5035d3fa4f37194de7adeefc65e6070..728ec34fd1feafdbf7d805fd15cb5760c839800e 100644
--- a/content/browser/storage_partition_impl.h
+++ b/content/browser/storage_partition_impl.h
@@ -31,10 +31,10 @@ class StoragePartitionImpl : public StoragePartition {
   virtual webkit_database::DatabaseTracker* GetDatabaseTracker() OVERRIDE;
   virtual DOMStorageContextImpl* GetDOMStorageContext() OVERRIDE;
   virtual IndexedDBContextImpl* GetIndexedDBContext() OVERRIDE;
+  virtual const CookieStoreMap& GetCookieStoreMap() OVERRIDE;
   virtual void AsyncClearDataForOrigin(
       uint32 storage_mask,
-      const GURL& storage_origin,
-      net::URLRequestContextGetter* request_context_getter) OVERRIDE;
+      const GURL& storage_origin) OVERRIDE;
   virtual void AsyncClearData(uint32 storage_mask) OVERRIDE;
   virtual void AsyncClearDataBetween(
       uint32 storage_mask,
@@ -54,9 +54,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<CookieStoreMap> cookie_store_map);
 
   CONTENT_EXPORT StoragePartitionImpl(
       const base::FilePath& partition_path,
@@ -66,6 +68,7 @@ class StoragePartitionImpl : public StoragePartition {
       webkit_database::DatabaseTracker* database_tracker,
       DOMStorageContextImpl* dom_storage_context,
       IndexedDBContextImpl* indexed_db_context,
+      scoped_ptr<CookieStoreMap> cookie_store_map,
       scoped_ptr<WebRTCIdentityStore> webrtc_identity_store);
 
   // Used by StoragePartitionImplMap.
@@ -93,6 +96,7 @@ class StoragePartitionImpl : public StoragePartition {
   scoped_refptr<webkit_database::DatabaseTracker> database_tracker_;
   scoped_refptr<DOMStorageContextImpl> dom_storage_context_;
   scoped_refptr<IndexedDBContextImpl> indexed_db_context_;
+  scoped_ptr<CookieStoreMap> cookie_store_map_;
   scoped_ptr<WebRTCIdentityStore> webrtc_identity_store_;
 
   DISALLOW_COPY_AND_ASSIGN(StoragePartitionImpl);