Remove the Extensions URLRequestContext

chrome/browser/browsing_data/browsing_data_remover_unittest.cc

Index: chrome/browser/browsing_data/browsing_data_remover_unittest.cc
diff --git a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
index b0746c21a8879e712d4d937024ad6b1839d91398..3dd012c48a60e9fc495ea911e6f61b97af4bd585 100644
--- a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
@@ -31,10 +31,13 @@
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
 #include "components/autofill/core/browser/personal_data_manager_observer.h"
+#include "content/public/browser/browser_context.h"
+#include "content/public/browser/cookie_store_factory.h"
+#include "content/public/browser/cookie_store_map.h"
 #include "content/public/browser/dom_storage_context.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/storage_partition.h"
-#include "content/public/test/test_browser_thread.h"
+#include "content/public/common/url_constants.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/ssl/server_bound_cert_service.h"
@@ -223,8 +226,10 @@ class RemoveCookieTester {
 class RemoveProfileCookieTester : public RemoveCookieTester {
  public:
   explicit RemoveProfileCookieTester(TestingProfile* profile) {
-    SetMonster(profile->GetRequestContext()->GetURLRequestContext()->
-        cookie_store()->GetCookieMonster());
+    content::StoragePartition* partition =
+        content::BrowserContext::GetDefaultStoragePartition(profile);
+    SetMonster(
+        partition->GetCookieStoreMap().GetForScheme(chrome::kHttpScheme));
   }
 };
 
@@ -241,7 +246,9 @@ class RemoveSafeBrowsingCookieTester : public RemoveCookieTester {
 
     // Create a cookiemonster that does not have persistant storage, and replace
     // the SafeBrowsingService created one with it.
-    net::CookieStore* monster = new net::CookieMonster(NULL, NULL);
+    net::CookieStore* monster =
+        content::CreateCookieStore(content::CookieStoreConfig::InMemory())->
+            GetCookieMonster();
     sb_service->url_request_context()->GetURLRequestContext()->
         set_cookie_store(monster);
     SetMonster(monster);