Clean up the media color format content_browsertests

content/browser/media/media_browsertest.cc

 // Copyright (c) 2013 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 "content/browser/media/media_browsertest.h"
 
 #include "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
@@ skipping 35 matching lines @@
   }
   std::string final_title = RunTest(gurl, expected_title);
   EXPECT_EQ(expected_title, final_title);
 }
 
 std::string MediaBrowserTest::RunTest(const GURL& gurl,
                                       const std::string& expected_title) {
   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));
 }
 
 // Tests playback and seeking of an audio or video file over file or http based
 // on a test parameter.  Test starts with playback, then, after X seconds or the
 // ended event fires, seeks near end of file; see player.html for details.  The
 // test completes when either the last 'ended' or an 'error' event fires.
 class MediaTest : public testing::WithParamInterface<bool>,
                   public MediaBrowserTest {
  public:
   // Play specified audio over http:// or file:// depending on |http| setting.
   void PlayAudio(const std::string& media_file, bool http) {
     PlayMedia("audio", media_file, http);
   }
 
   // Play specified video over http:// or file:// depending on |http| setting.
   void PlayVideo(const std::string& media_file, bool http) {
     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) {
     base::StringPairs query_params;
     query_params.push_back(std::make_pair(tag, media_file));
     RunMediaTestPage("player.html", query_params, kEnded, http);
   }
 
   void RunVideoSizeTest(const char* media_file, int width, int height) {
     std::string expected;
@@ skipping 143 matching lines @@
 // Covers tear-down when navigating away as opposed to browser exiting.
 IN_PROC_BROWSER_TEST_F(MediaTest, Navigate) {
   PlayVideo("bear.ogv", false);
   NavigateToURL(shell(), GURL(url::kAboutBlankURL));
   EXPECT_FALSE(shell()->web_contents()->IsCrashed());
 }
 
 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