Remove the Extensions URLRequestContext

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 1a47b406d80c72c66491c8ae0043b31e5ffb4396..a11ba125ef3b0ec40eb4b404a5ccbe8efcba9ce9 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -1359,13 +1359,14 @@ bool ChromeContentBrowserClient::AllowWorkerIndexedDB(
   return allow;
 }
 
-net::URLRequestContext*
-ChromeContentBrowserClient::OverrideRequestContextForURL(
+net::CookieStore*
+ChromeContentBrowserClient::OverrideCookieStoreForURL(
     const GURL& url, content::ResourceContext* context) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (url.SchemeIs(extensions::kExtensionScheme)) {
     ProfileIOData* io_data = ProfileIOData::FromResourceContext(context);
-    return io_data->extensions_request_context();
+    // TODO(ajwong): Does this leave a hole based on storage partition?
+    return io_data->GetExtensionsCookieStore();
   }
 
   return NULL;