Remove the Extensions URLRequestContext

content/browser/storage_partition_impl.cc

 // 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.
 
 #include "content/browser/storage_partition_impl.h"
 
 #include "base/utf_string_conversions.h"
 #include "content/browser/fileapi/browser_file_system_helper.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/dom_storage_context.h"
 #include "content/public/browser/indexed_db_context.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_errors.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_context.h"
 #include "webkit/database/database_tracker.h"
 #include "webkit/dom_storage/dom_storage_types.h"
 #include "webkit/quota/quota_manager.h"
@@ skipping 16 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   std::set<GURL>::const_iterator origin;
   for (std::set<GURL>::const_iterator origin = origins.begin();
        origin != origins.end(); ++origin) {
     quota_manager->DeleteOriginData(*origin, quota_storage_type,
                                     quota::QuotaClient::kAllClientsMask,
                                     base::Bind(&DoNothingStatusCallback));
   }
 }
 
+net::CookieMonster* GetCookieMonsterForOrigin(
+    const GURL& storage_origin,
+    net::URLRequestContext* default_request_context) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  net::CookieStore* cookie_store =
+      content::GetContentClient()->browser()->OverrideCookieStoreForURL(
+          storage_origin, NULL);
+  if (!cookie_store) {
+    cookie_store = default_request_context->cookie_store();
+  }
+
+  return cookie_store->GetCookieMonster();
+}
+
 void ClearOriginOnIOThread(
     uint32 storage_mask,
     const GURL& storage_origin,
     const scoped_refptr<net::URLRequestContextGetter>& request_context,
     const scoped_refptr<quota::QuotaManager>& quota_manager) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   if (storage_mask & StoragePartition::kCookies) {
     // Handle the cookies.
     net::CookieMonster* cookie_monster =
-        request_context->GetURLRequestContext()->cookie_store()->
-            GetCookieMonster();
-    if (cookie_monster)
+        GetCookieMonsterForOrigin(storage_origin,
+                                  request_context->GetURLRequestContext());
+    if (cookie_monster) {
       cookie_monster->DeleteAllForHostAsync(
           storage_origin, net::CookieMonster::DeleteCallback());
+    }
   }
 
   // Handle all HTML5 storage other than DOMStorageContext.
   std::set<GURL> origins;
   origins.insert(storage_origin);
   if (storage_mask & StoragePartition::kQuotaManagedTemporaryStorage) {
     ClearQuotaManagedOriginsOnIOThread(quota_manager,
                                        origins,
                                        quota::kStorageTypeTemporary);
   }
   if (storage_mask & StoragePartition::kQuotaManagedPersistentStorage) {
     ClearQuotaManagedOriginsOnIOThread(quota_manager,
                                        origins,
                                        quota::kStorageTypePersistent);
   }
 }
 
 void ClearAllDataOnIOThread(
     uint32 storage_mask,
     const scoped_refptr<net::URLRequestContextGetter>& request_context,
     const scoped_refptr<quota::QuotaManager>& quota_manager) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   if (storage_mask & StoragePartition::kCookies) {
     // Handle the cookies.
-    net::CookieMonster* cookie_monster =
-        request_context->GetURLRequestContext()->cookie_store()->
-            GetCookieMonster();
+    net::CookieMonster* cookie_monster = NULL;
+    /*
+        GetCookieMonsterForOrigin(storage_origin,
+                                  request_context->GetURLRequestContext());
+                                  */
     if (cookie_monster)
       cookie_monster->DeleteAllAsync(net::CookieMonster::DeleteCallback());
   }
 
   // Handle all HTML5 storage other than DOMStorageContext.
   if (storage_mask & StoragePartition::kQuotaManagedTemporaryStorage) {
     quota_manager->GetOriginsModifiedSince(
         quota::kStorageTypeTemporary, base::Time(),
         base::Bind(&ClearQuotaManagedOriginsOnIOThread, quota_manager));
   }
@@ skipping 147 matching lines @@
 DOMStorageContextImpl* StoragePartitionImpl::GetDOMStorageContext() {
   return dom_storage_context_;
 }
 
 IndexedDBContextImpl* StoragePartitionImpl::GetIndexedDBContext() {
   return indexed_db_context_;
 }
 
 void StoragePartitionImpl::AsyncClearDataForOrigin(
     uint32 storage_mask,
-    const GURL& storage_origin,
-    net::URLRequestContextGetter* request_context_getter) {
+    const GURL& storage_origin) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
-      base::Bind(&ClearOriginOnIOThread,
-                 storage_mask,
-                 storage_origin,
-                 make_scoped_refptr(request_context_getter),
-                 quota_manager_));
+      base::Bind(&ClearOriginOnIOThread, storage_mask, storage_origin,
+                 url_request_context_, quota_manager_));
 
   if (storage_mask & kLocalDomStorage)
     GetDOMStorageContext()->DeleteLocalStorage(storage_origin);
 }
 
 void StoragePartitionImpl::AsyncClearData(uint32 storage_mask) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // We ignore the media request context because it shares the same cookie store
   // as the main request context.
@@ skipping 19 matching lines @@
     net::URLRequestContextGetter* url_request_context) {
   url_request_context_ = url_request_context;
 }
 
 void StoragePartitionImpl::SetMediaURLRequestContext(
     net::URLRequestContextGetter* media_url_request_context) {
   media_url_request_context_ = media_url_request_context;
 }
 
 }  // namespace content