Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(286)

Unified Diff: content/browser/media/session/audio_focus_delegate_default_browsertest.cc

Issue 2416853005: Fixing naming issues in MediaSession (Closed)
Patch Set: owners Created 4 years, 2 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
Index: content/browser/media/session/audio_focus_delegate_default_browsertest.cc
diff --git a/content/browser/media/session/media_session_delegate_default_browsertest.cc b/content/browser/media/session/audio_focus_delegate_default_browsertest.cc
similarity index 82%
rename from content/browser/media/session/media_session_delegate_default_browsertest.cc
rename to content/browser/media/session/audio_focus_delegate_default_browsertest.cc
index 921c084636b984aab613466a9aaec41d73ef5e80..e3ef2b95766e5c25c47af1d2a63cb097e336be47 100644
--- a/content/browser/media/session/media_session_delegate_default_browsertest.cc
+++ b/content/browser/media/session/audio_focus_delegate_default_browsertest.cc
@@ -4,7 +4,7 @@
#include "base/command_line.h"
#include "content/browser/media/session/media_session.h"
-#include "content/browser/media/session/mock_media_session_observer.h"
+#include "content/browser/media/session/mock_media_session_player_observer.h"
#include "content/public/test/content_browser_test.h"
#include "content/shell/browser/shell.h"
#include "media/base/media_content_type.h"
@@ -19,8 +19,8 @@ class MediaSessionDelegateDefaultBrowserTest : public ContentBrowserTest {
}
void Run(WebContents* start_contents, WebContents* interrupt_contents) {
- std::unique_ptr<MockMediaSessionObserver> media_session_observer(
- new MockMediaSessionObserver);
+ std::unique_ptr<MockMediaSessionPlayerObserver>
+ media_session_player_observer(new MockMediaSessionPlayerObserver);
MediaSession* media_session = MediaSession::Get(start_contents);
ASSERT_TRUE(media_session);
@@ -28,14 +28,14 @@ class MediaSessionDelegateDefaultBrowserTest : public ContentBrowserTest {
MediaSession* other_media_session = MediaSession::Get(interrupt_contents);
ASSERT_TRUE(other_media_session);
- media_session_observer->StartNewPlayer();
- media_session->AddPlayer(media_session_observer.get(), 0,
+ media_session_player_observer->StartNewPlayer();
+ media_session->AddPlayer(media_session_player_observer.get(), 0,
media::MediaContentType::Persistent);
EXPECT_TRUE(media_session->IsActive());
EXPECT_FALSE(other_media_session->IsActive());
- media_session_observer->StartNewPlayer();
- other_media_session->AddPlayer(media_session_observer.get(), 1,
+ media_session_player_observer->StartNewPlayer();
+ other_media_session->AddPlayer(media_session_player_observer.get(), 1,
media::MediaContentType::Persistent);
EXPECT_FALSE(media_session->IsActive());
EXPECT_TRUE(other_media_session->IsActive());

Powered by Google App Engine
This is Rietveld 408576698