Revert of Change the video color space default.

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/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
@@ skipping 60 matching lines @@
     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_title) {
+                          const std::string& expected) {
     base::FilePath test_file_path =
         media::GetTestDataFilePath("blackwhite.html");
-    std::string final_title = RunTest(
-        GetFileUrlWithQuery(test_file_path, media_file), expected_title);
-    EXPECT_EQ(expected_title, final_title);
+    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);
   }
 
@@ skipping 146 matching lines @@
 
 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", kEnded);
+  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, Yuvj420pH264) {
-  // TODO(watk): Re-enable this when JPEG color range support is fixed.
-  // crbug.com/507455
-  // RunColorFormatTest("yuvj420p.mp4", kEnded);
+  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