content/browser/media/cdm/browser_cdm_manager.cc - Issue 1878153002: Revert of Simplify BrowserContext by removing redundant methods.

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/browser/media/cdm/browser_cdm_manager.cc

Issue 1878153002: Revert of Simplify BrowserContext by removing redundant methods. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 8 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 | « content/browser/media/android/provision_fetcher_impl.cc ('k') | content/browser/renderer_host/render_view_host_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/media/cdm/browser_cdm_manager.cc

diff --git a/content/browser/media/cdm/browser_cdm_manager.cc b/content/browser/media/cdm/browser_cdm_manager.cc

index c50184af2487736dbc9d54c10ca253d1081ef84c..b2bc2c97c2ec3adeb336a29b46efac2aaa3000ef 100644

--- a/content/browser/media/cdm/browser_cdm_manager.cc

+++ b/content/browser/media/cdm/browser_cdm_manager.cc

@@ -23,7 +23,6 @@

#include "content/public/browser/render_frame_host.h"

#include "content/public/browser/render_process_host.h"

#include "content/public/browser/render_process_host_observer.h"

-#include "content/public/browser/storage_partition.h"

#include "content/public/browser/web_contents.h"

#include "media/base/cdm_config.h"

#include "media/base/cdm_factory.h"

@@ -292,9 +291,9 @@

if (!cdm_factory_) {

// Obtain http request context for the current render process.

net::URLRequestContextGetter* context_getter =

- BrowserContext::GetDefaultStoragePartition(

- RenderProcessHost::FromID(render_process_id_)->

- GetBrowserContext())->GetURLRequestContext();

+ RenderProcessHost::FromID(render_process_id_)

+ ->GetBrowserContext()

+ ->GetRequestContext();

DCHECK(context_getter);

cdm_factory_.reset(new media::AndroidCdmFactory(