Clean up the media color format content_browsertests

content/browser/media/media_browsertest.cc

Index: content/browser/media/media_browsertest.cc
diff --git a/content/browser/media/media_browsertest.cc b/content/browser/media/media_browsertest.cc
index 6d28a8afd2b94c7804aabf2346bec71768fb5512..826a072ca8bc3b3cd04b83664486b88c1a6a2e56 100644
--- a/content/browser/media/media_browsertest.cc
+++ b/content/browser/media/media_browsertest.cc
@@ -53,13 +53,13 @@ std::string MediaBrowserTest::RunTest(const GURL& gurl,
   VLOG(0) << "Running test URL: " << gurl;
   TitleWatcher title_watcher(shell()->web_contents(),
                              base::ASCIIToUTF16(expected_title));
-  AddWaitForTitles(&title_watcher);
+  AddTitlesToAwait(&title_watcher);
   NavigateToURL(shell(), gurl);
   base::string16 result = title_watcher.WaitAndGetTitle();
   return base::UTF16ToASCII(result);
 }
 
-void MediaBrowserTest::AddWaitForTitles(content::TitleWatcher* title_watcher) {
+void MediaBrowserTest::AddTitlesToAwait(content::TitleWatcher* title_watcher) {
   title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kEnded));
   title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kError));
   title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kFailed));
@@ -82,14 +82,6 @@ class MediaTest : public testing::WithParamInterface<bool>,
     PlayMedia("video", media_file, http);
   }
 
-  // Run specified color format test with the expected result.
-  void RunColorFormatTest(const std::string& media_file,
-                          const std::string& expected) {
-    base::FilePath test_file_path =
-        media::GetTestDataFilePath("blackwhite.html");
-    RunTest(GetFileUrlWithQuery(test_file_path, media_file), expected);
-  }
-
   void PlayMedia(const std::string& tag,
                  const std::string& media_file,
                  bool http) {
@@ -253,56 +245,4 @@ IN_PROC_BROWSER_TEST_F(MediaTest, Navigate) {
 INSTANTIATE_TEST_CASE_P(File, MediaTest, ::testing::Values(false));
 INSTANTIATE_TEST_CASE_P(Http, MediaTest, ::testing::Values(true));
 
-IN_PROC_BROWSER_TEST_F(MediaTest, Yuv420pTheora) {
-  RunColorFormatTest("yuv420p.ogv", kEnded);
-}
-
-IN_PROC_BROWSER_TEST_F(MediaTest, Yuv422pTheora) {
-  RunColorFormatTest("yuv422p.ogv", kEnded);
-}
-
-IN_PROC_BROWSER_TEST_F(MediaTest, Yuv444pTheora) {
-  RunColorFormatTest("yuv444p.ogv", kEnded);
-}
-
-IN_PROC_BROWSER_TEST_F(MediaTest, Yuv420pVp8) {
-  RunColorFormatTest("yuv420p.webm", kEnded);
-}
-
-IN_PROC_BROWSER_TEST_F(MediaTest, Yuv444pVp9) {
-  RunColorFormatTest("yuv444p.webm", "ENDED");
-}
-
-#if defined(USE_PROPRIETARY_CODECS)
-IN_PROC_BROWSER_TEST_F(MediaTest, Yuv420pH264) {
-  RunColorFormatTest("yuv420p.mp4", kEnded);
-}
-
-IN_PROC_BROWSER_TEST_F(MediaTest, Yuv420pRec709H264) {
-  RunColorFormatTest("yuv420p_rec709.mp4", kEnded);
-}
-
-IN_PROC_BROWSER_TEST_F(MediaTest, Yuv420pHighBitDepth) {
-  RunColorFormatTest("yuv420p_hi10p.mp4", kEnded);
-}
-
-IN_PROC_BROWSER_TEST_F(MediaTest, Yuvj420pH264) {
-  RunColorFormatTest("yuvj420p.mp4", kEnded);
-}
-
-IN_PROC_BROWSER_TEST_F(MediaTest, Yuv422pH264) {
-  RunColorFormatTest("yuv422p.mp4", kEnded);
-}
-
-IN_PROC_BROWSER_TEST_F(MediaTest, Yuv444pH264) {
-  RunColorFormatTest("yuv444p.mp4", kEnded);
-}
-
-#if defined(OS_CHROMEOS)
-IN_PROC_BROWSER_TEST_F(MediaTest, Yuv420pMpeg4) {
-  RunColorFormatTest("yuv420p.avi", kEnded);
-}
-#endif  // defined(OS_CHROMEOS)
-#endif  // defined(USE_PROPRIETARY_CODECS)
-
 }  // namespace content