content/browser/media/session/media_session_delegate_default_browsertest.cc - Issue 1996043002: Split MediaContentType and AudioFocusType

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/session/media_session_delegate_default_browsertest.cc

Issue 1996043002: Split MediaContentType and AudioFocusType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fixed desktop build & tests Created 4 years, 5 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

« content/browser/media/session/media_session.h ('K') | « content/browser/media/session/media_session_delegate_default.cc ('k') | content/browser/media/session/pepper_playback_observer.cc » ('j') | content/renderer/media/webmediaplayer_ms.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/media/session/media_session_delegate_default_browsertest.cc

diff --git a/content/browser/media/session/media_session_delegate_default_browsertest.cc b/content/browser/media/session/media_session_delegate_default_browsertest.cc

index 5d000ea9cbb94d28e52566a971c01e116c6ed8ad..33a157e099ffd1e8fb0efffb7de3f3a3affa8ecd 100644

--- a/content/browser/media/session/media_session_delegate_default_browsertest.cc

+++ b/content/browser/media/session/media_session_delegate_default_browsertest.cc

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

#include "content/browser/media/session/mock_media_session_observer.h"

#include "content/public/test/content_browser_test.h"

#include "content/shell/browser/shell.h"

+#include "media/base/media_content_type.h"

#include "media/base/media_switches.h"

namespace content {

@@ -29,13 +30,13 @@ class MediaSessionDelegateDefaultBrowserTest : public ContentBrowserTest {

media_session_observer->StartNewPlayer();

media_session->AddPlayer(

- media_session_observer.get(), 0, MediaSession::Type::Content);

+ media_session_observer.get(), 0, media::MediaContentType::Content);

EXPECT_TRUE(media_session->IsActive());

EXPECT_FALSE(other_media_session->IsActive());

media_session_observer->StartNewPlayer();

other_media_session->AddPlayer(

- media_session_observer.get(), 1, MediaSession::Type::Content);

+ media_session_observer.get(), 1, media::MediaContentType::Content);

EXPECT_FALSE(media_session->IsActive());

EXPECT_TRUE(other_media_session->IsActive());