Remove the Extensions URLRequestContext

android_webview/browser/aw_browser_context.cc

Index: android_webview/browser/aw_browser_context.cc
diff --git a/android_webview/browser/aw_browser_context.cc b/android_webview/browser/aw_browser_context.cc
index 51f1c17bc1707de49c746b93d583a212d57e556c..5f710b170029e65d1e8a8f118780be9339bc998a 100644
--- a/android_webview/browser/aw_browser_context.cc
+++ b/android_webview/browser/aw_browser_context.cc
@@ -16,6 +16,7 @@
 #include "components/user_prefs/user_prefs.h"
 #include "components/visitedlink/browser/visitedlink_master.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/cookie_store_factory.h"
 #include "content/public/browser/resource_context.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
@@ -108,6 +109,9 @@ void AwBrowserContext::AddVisitedURLs(const std::vector<GURL>& urls) {
 
 net::URLRequestContextGetter* AwBrowserContext::CreateRequestContext(
     content::ProtocolHandlerMap* protocol_handlers) {
+  // TODO(ajwong): The whole interaction between
+  // BrowserThreadDelegate::Init(), StoragePartition, and OverrideCookieStoreMap
+  // is confusing.
   CHECK(url_request_context_getter_.get());
   url_request_context_getter_->SetProtocolHandlers(protocol_handlers);
   return url_request_context_getter_.get();
@@ -172,6 +176,12 @@ bool AwBrowserContext::IsOffTheRecord() const {
   return false;
 }
 
+content::CookieStoreConfig AwBrowserContext::GetCookieStoreConfig() {
+  return content::CookieStoreConfig::Persistent(
+      GetPath().Append(kCookieFilename),
+      content::CookieStoreConfig::RESTORED_SESSION_COOKIES);
+}
+
 net::URLRequestContextGetter* AwBrowserContext::GetRequestContext() {
   return GetDefaultStoragePartition(this)->GetURLRequestContext();
 }
@@ -237,6 +247,13 @@ quota::SpecialStoragePolicy* AwBrowserContext::GetSpecialStoragePolicy() {
   return NULL;
 }
 
+void AwBrowserContext::OverrideCookieStoreMap(
+    bool in_memory,
+    const base::FilePath& partition_path,
+    bool is_default,
+    CookieStoreMap* cookie_store_map) {
+}
+
 void AwBrowserContext::RebuildTable(
     const scoped_refptr<URLEnumerator>& enumerator) {
   // Android WebView rebuilds from WebChromeClient.getVisitedHistory. The client