Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8)

Unified Diff: trunk/src/chrome/browser/browsing_data/browsing_data_remover_unittest.cc

Issue 23551005: Revert 219709 "Remove the Extensions URLRequestContext." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: trunk/src/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
===================================================================
--- trunk/src/chrome/browser/browsing_data/browsing_data_remover_unittest.cc (revision 219785)
+++ trunk/src/chrome/browser/browsing_data/browsing_data_remover_unittest.cc (working copy)
@@ -31,15 +31,12 @@
#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/dom_storage_context.h"
#include "content/public/browser/local_storage_usage_info.h"
#include "content/public/browser/notification_service.h"
#include "content/public/browser/storage_partition.h"
-#include "content/public/common/url_constants.h"
+#include "content/public/test/test_browser_thread.h"
#include "content/public/test/test_browser_thread_bundle.h"
-#include "content/public/test/test_utils.h"
#include "net/cookies/cookie_monster.h"
#include "net/ssl/server_bound_cert_service.h"
#include "net/ssl/server_bound_cert_store.h"
@@ -226,9 +223,8 @@
class RemoveProfileCookieTester : public RemoveCookieTester {
public:
explicit RemoveProfileCookieTester(TestingProfile* profile) {
- SetMonster(
- content::BrowserContext::GetDefaultStoragePartition(profile)->
- GetCookieStoreForScheme(chrome::kHttpScheme)->GetCookieMonster());
+ SetMonster(profile->GetRequestContext()->GetURLRequestContext()->
+ cookie_store()->GetCookieMonster());
}
};
@@ -245,9 +241,7 @@
// Create a cookiemonster that does not have persistant storage, and replace
// the SafeBrowsingService created one with it.
- net::CookieStore* monster =
- content::CreateCookieStore(content::CookieStoreConfig())->
- GetCookieMonster();
+ net::CookieStore* monster = new net::CookieMonster(NULL, NULL);
sb_service->url_request_context()->GetURLRequestContext()->
set_cookie_store(monster);
SetMonster(monster);

Powered by Google App Engine
This is Rietveld 408576698