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

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

Issue 2416853005: Fixing naming issues in MediaSession (Closed)
Patch Set: addressed nits 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/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
deleted file mode 100644
index 921c084636b984aab613466a9aaec41d73ef5e80..0000000000000000000000000000000000000000
--- a/content/browser/media/session/media_session_delegate_default_browsertest.cc
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#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/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 {
-
-class MediaSessionDelegateDefaultBrowserTest : public ContentBrowserTest {
- protected:
- void SetUpCommandLine(base::CommandLine* command_line) override {
- command_line->AppendSwitch(switches::kEnableDefaultMediaSession);
- }
-
- void Run(WebContents* start_contents, WebContents* interrupt_contents) {
- std::unique_ptr<MockMediaSessionObserver> media_session_observer(
- new MockMediaSessionObserver);
-
- MediaSession* media_session = MediaSession::Get(start_contents);
- ASSERT_TRUE(media_session);
-
- 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::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::MediaContentType::Persistent);
- EXPECT_FALSE(media_session->IsActive());
- EXPECT_TRUE(other_media_session->IsActive());
-
- media_session->Stop(MediaSession::SuspendType::UI);
- other_media_session->Stop(MediaSession::SuspendType::UI);
- }
-};
-
-// Two windows from the same BrowserContext.
-IN_PROC_BROWSER_TEST_F(MediaSessionDelegateDefaultBrowserTest,
- ActiveWebContentsPauseOthers) {
- Run(shell()->web_contents(), CreateBrowser()->web_contents());
-}
-
-// Regular BrowserContext is interrupted by OffTheRecord one.
-IN_PROC_BROWSER_TEST_F(MediaSessionDelegateDefaultBrowserTest,
- RegularBrowserInterruptsOffTheRecord) {
- Run(shell()->web_contents(), CreateOffTheRecordBrowser()->web_contents());
-}
-
-// OffTheRecord BrowserContext is interrupted by regular one.
-IN_PROC_BROWSER_TEST_F(MediaSessionDelegateDefaultBrowserTest,
- OffTheRecordInterruptsRegular) {
- Run(CreateOffTheRecordBrowser()->web_contents(), shell()->web_contents());
-}
-
-} // namespace content

Powered by Google App Engine
This is Rietveld 408576698