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

Unified Diff: chrome/test/testing_profile.cc

Issue 6201005: Initial support for partitioning cookies for isolated apps. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge conflicts. Created 9 years, 9 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
« no previous file with comments | « chrome/test/testing_profile.h ('k') | content/browser/renderer_host/render_message_filter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/testing_profile.cc
diff --git a/chrome/test/testing_profile.cc b/chrome/test/testing_profile.cc
index c995347ddbefc4a4145548d54527351a8552a1fe..63db4c73b1760fd67ebdc617b2b6459c4dbbea4c 100644
--- a/chrome/test/testing_profile.cc
+++ b/chrome/test/testing_profile.cc
@@ -563,6 +563,14 @@ URLRequestContextGetter* TestingProfile::GetRequestContext() {
return request_context_.get();
}
+URLRequestContextGetter* TestingProfile::GetRequestContextForPossibleApp(
+ const Extension* installed_app) {
+ if (installed_app != NULL && installed_app->is_storage_isolated())
+ return GetRequestContextForIsolatedApp(installed_app->id());
+
+ return GetRequestContext();
+}
+
void TestingProfile::CreateRequestContext() {
if (!request_context_)
request_context_ = new TestURLRequestContextGetter();
@@ -590,6 +598,13 @@ UserStyleSheetWatcher* TestingProfile::GetUserStyleSheetWatcher() {
return NULL;
}
+URLRequestContextGetter* TestingProfile::GetRequestContextForIsolatedApp(
+ const std::string& app_id) {
+ // We don't test isolated app storage here yet, so returning the same dummy
+ // context is sufficient for now.
+ return GetRequestContext();
+}
+
FindBarState* TestingProfile::GetFindBarState() {
if (!find_bar_state_.get())
find_bar_state_.reset(new FindBarState());
« no previous file with comments | « chrome/test/testing_profile.h ('k') | content/browser/renderer_host/render_message_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698