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

Unified Diff: chromecast/browser/cast_media_blocker_browsertest.cc

Issue 2499563002: [chromecast] Make testnames consistent. (Closed)
Patch Set: removes mojo dependency Created 4 years, 1 month 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: chromecast/browser/cast_media_blocker_browsertest.cc
diff --git a/chromecast/browser/test/chromecast_shell_media_blocking_browser_test.cc b/chromecast/browser/cast_media_blocker_browsertest.cc
similarity index 84%
rename from chromecast/browser/test/chromecast_shell_media_blocking_browser_test.cc
rename to chromecast/browser/cast_media_blocker_browsertest.cc
index 65065dec8a650bb35a6eb7f4d0d6fa900ce34c55..94a9ddabc273a96d7cf6073a358be1ba0e3a4fe3 100644
--- a/chromecast/browser/test/chromecast_shell_media_blocking_browser_test.cc
+++ b/chromecast/browser/cast_media_blocker_browsertest.cc
@@ -7,7 +7,7 @@
#include "base/threading/platform_thread.h"
#include "base/threading/thread_task_runner_handle.h"
#include "chromecast/browser/cast_media_blocker.h"
-#include "chromecast/browser/test/chromecast_browser_test.h"
+#include "chromecast/browser/test/cast_browser_test.h"
#include "chromecast/chromecast_features.h"
#include "content/public/browser/media_session.h"
#include "content/public/browser/web_contents.h"
@@ -19,16 +19,16 @@
namespace chromecast {
namespace shell {
-class ChromecastShellMediaBlockingBrowserTest : public ChromecastBrowserTest {
+class CastMediaBlockerBrowserTest : public CastBrowserTest {
public:
- ChromecastShellMediaBlockingBrowserTest() {}
+ CastMediaBlockerBrowserTest() {}
protected:
- // ChromecastBrowserTest implementation.
+ // CastBrowserTest implementation.
void TearDownOnMainThread() override {
blocker_.reset();
- ChromecastBrowserTest::TearDownOnMainThread();
+ CastBrowserTest::TearDownOnMainThread();
}
void PlayMedia(const std::string& tag, const std::string& media_file) {
@@ -83,11 +83,10 @@ class ChromecastShellMediaBlockingBrowserTest : public ChromecastBrowserTest {
content::WebContents* web_contents_;
std::unique_ptr<CastMediaBlocker> blocker_;
- DISALLOW_COPY_AND_ASSIGN(ChromecastShellMediaBlockingBrowserTest);
+ DISALLOW_COPY_AND_ASSIGN(CastMediaBlockerBrowserTest);
};
-IN_PROC_BROWSER_TEST_F(ChromecastShellMediaBlockingBrowserTest,
- Audio_BlockUnblock) {
+IN_PROC_BROWSER_TEST_F(CastMediaBlockerBrowserTest, Audio_BlockUnblock) {
PlayMedia("audio", "bear-audio-10s-CBR-has-TOC.mp3");
BlockAndTestPlayerState("audio", true);
@@ -95,8 +94,7 @@ IN_PROC_BROWSER_TEST_F(ChromecastShellMediaBlockingBrowserTest,
}
#if !BUILDFLAG(IS_CAST_AUDIO_ONLY)
-IN_PROC_BROWSER_TEST_F(ChromecastShellMediaBlockingBrowserTest,
- Video_BlockUnblock) {
+IN_PROC_BROWSER_TEST_F(CastMediaBlockerBrowserTest, Video_BlockUnblock) {
PlayMedia("video", "tulip2.webm");
BlockAndTestPlayerState("video", true);

Powered by Google App Engine
This is Rietveld 408576698