chrome/test/base/testing_profile.cc - Issue 10836305: Ensure that isolated apps use the right cookies for media requests.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/test/base/testing_profile.cc

Issue 10836305: Ensure that isolated apps use the right cookies for media requests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix merge conflict. Created 8 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:

Index: chrome/test/base/testing_profile.cc

diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc

index eabf2e3f2753ad150c64406257edcb109eb2ba7f..e7f5c44913110afd2c884b1942ea4c25bfd95d72 100644

--- a/chrome/test/base/testing_profile.cc

+++ b/chrome/test/base/testing_profile.cc

@@ -631,7 +631,13 @@ void TestingProfile::ResetRequestContext() {

request_context_ = NULL;

}

-net::URLRequestContextGetter* TestingProfile::GetRequestContextForMedia() {

+net::URLRequestContextGetter* TestingProfile::GetMediaRequestContext() {

+ return NULL;

+net::URLRequestContextGetter*

+TestingProfile::GetMediaRequestContextForRenderProcess(

+ int renderer_child_id) {

return NULL;

}