content/public/test/test_browser_context.h - 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: content/public/test/test_browser_context.h

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: content/public/test/test_browser_context.h

diff --git a/content/public/test/test_browser_context.h b/content/public/test/test_browser_context.h

index a05e0291adca5e0da1bf80f8b080e430da0ebd38..4030aa6b456757d2f92c9117eef0d56225d1da51 100644

--- a/content/public/test/test_browser_context.h

+++ b/content/public/test/test_browser_context.h

@@ -33,7 +33,9 @@ class TestBrowserContext : public BrowserContext {

virtual net::URLRequestContextGetter* GetRequestContext() OVERRIDE;

virtual net::URLRequestContextGetter* GetRequestContextForRenderProcess(

int renderer_child_id) OVERRIDE;

- virtual net::URLRequestContextGetter* GetRequestContextForMedia() OVERRIDE;

+ virtual net::URLRequestContextGetter* GetMediaRequestContext() OVERRIDE;

+ virtual net::URLRequestContextGetter* GetMediaRequestContextForRenderProcess(

+ int renderer_child_id) OVERRIDE;

virtual ResourceContext* GetResourceContext() OVERRIDE;

virtual GeolocationPermissionContext*

GetGeolocationPermissionContext() OVERRIDE;