third_party/WebKit/Source/modules/mediasession/MediaSessionTest.cpp - Issue 1441883003: Hook up RendererMediaSessionManager with browser side

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: third_party/WebKit/Source/modules/mediasession/MediaSessionTest.cpp

Issue 1441883003: Hook up RendererMediaSessionManager with browser side (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address review comment from philipj: ActiveDOMObject Created 5 years 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

« third_party/WebKit/Source/modules/mediasession/MediaSession.h ('K') | « third_party/WebKit/Source/modules/mediasession/MediaSession.cpp ('k') | third_party/WebKit/public/platform/modules/mediasession/WebMediaSession.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/mediasession/MediaSessionTest.cpp

diff --git a/third_party/WebKit/Source/modules/mediasession/MediaSessionTest.cpp b/third_party/WebKit/Source/modules/mediasession/MediaSessionTest.cpp

index 8927e8aef7189185439b2fefdbab6889c8cc9000..bba8ca4a00ab92a8056cc3ef4e44f661c06e9a47 100644

--- a/third_party/WebKit/Source/modules/mediasession/MediaSessionTest.cpp

+++ b/third_party/WebKit/Source/modules/mediasession/MediaSessionTest.cpp

@@ -26,7 +26,7 @@ protected:

{

// The MediaSession takes ownership of the WebMediaSession, and the

// caller must take care to not end up with a stale pointer.

- return new MediaSession(adoptPtr(webMediaSession));

+ return new MediaSession(&document(), adoptPtr(webMediaSession));

}

Document& document() { return m_page->document(); }

@@ -41,6 +41,7 @@ class MockWebMediaSession : public WebMediaSession {

public:

MOCK_METHOD1(activate, void(WebMediaSessionActivateCallback*));

MOCK_METHOD1(deactivate, void(WebMediaSessionDeactivateCallback*));

+ bool hasPendingCallbacks() override { return false; }

};

class Helper {