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

Side by Side Diff: content/browser/media/media_color_browsertest.cc

Issue 2572883002: Convert USE_PROPRIETARY_CODECS to a buildflag header. (Closed)
Patch Set: Merge Created 4 years 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "build/build_config.h" 5 #include "build/build_config.h"
6 #include "content/browser/media/media_browsertest.h" 6 #include "content/browser/media/media_browsertest.h"
7 #include "content/public/test/browser_test_utils.h" 7 #include "content/public/test/browser_test_utils.h"
8 #include "media/base/test_data_util.h" 8 #include "media/base/test_data_util.h"
9 #include "media/media_features.h"
9 10
10 namespace content { 11 namespace content {
11 12
12 class MediaColorTest : public MediaBrowserTest { 13 class MediaColorTest : public MediaBrowserTest {
13 public: 14 public:
14 void RunColorTest(const std::string& video_file) { 15 void RunColorTest(const std::string& video_file) {
15 base::FilePath path = media::GetTestDataFilePath("blackwhite.html"); 16 base::FilePath path = media::GetTestDataFilePath("blackwhite.html");
16 std::string final_title = 17 std::string final_title =
17 RunTest(GetFileUrlWithQuery(path, video_file), kEnded); 18 RunTest(GetFileUrlWithQuery(path, video_file), kEnded);
18 EXPECT_EQ(kEnded, final_title); 19 EXPECT_EQ(kEnded, final_title);
(...skipping 16 matching lines...) Expand all
35 #endif // !defined(OS_ANDROID) 36 #endif // !defined(OS_ANDROID)
36 37
37 IN_PROC_BROWSER_TEST_F(MediaColorTest, Yuv420pVp8) { 38 IN_PROC_BROWSER_TEST_F(MediaColorTest, Yuv420pVp8) {
38 RunColorTest("yuv420p.webm"); 39 RunColorTest("yuv420p.webm");
39 } 40 }
40 41
41 IN_PROC_BROWSER_TEST_F(MediaColorTest, Yuv444pVp9) { 42 IN_PROC_BROWSER_TEST_F(MediaColorTest, Yuv444pVp9) {
42 RunColorTest("yuv444p.webm"); 43 RunColorTest("yuv444p.webm");
43 } 44 }
44 45
45 #if defined(USE_PROPRIETARY_CODECS) 46 #if BUILDFLAG(USE_PROPRIETARY_CODECS)
46 47
47 // This fails on some Android devices: http://crbug.com/649199, 48 // This fails on some Android devices: http://crbug.com/649199,
48 // http://crbug.com/649185. 49 // http://crbug.com/649185.
49 #if defined(OS_ANDROID) 50 #if defined(OS_ANDROID)
50 #define MAYBE_Yuv420pH264 DISABLED_Yuv420pH264 51 #define MAYBE_Yuv420pH264 DISABLED_Yuv420pH264
51 #else 52 #else
52 #define MAYBE_Yuv420pH264 Yuv420pH264 53 #define MAYBE_Yuv420pH264 Yuv420pH264
53 #endif 54 #endif
54 IN_PROC_BROWSER_TEST_F(MediaColorTest, MAYBE_Yuv420pH264) { 55 IN_PROC_BROWSER_TEST_F(MediaColorTest, MAYBE_Yuv420pH264) {
55 RunColorTest("yuv420p.mp4"); 56 RunColorTest("yuv420p.mp4");
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 IN_PROC_BROWSER_TEST_F(MediaColorTest, Yuv444pH264) { 93 IN_PROC_BROWSER_TEST_F(MediaColorTest, Yuv444pH264) {
93 RunColorTest("yuv444p.mp4"); 94 RunColorTest("yuv444p.mp4");
94 } 95 }
95 #endif // !defined(OS_ANDROID) 96 #endif // !defined(OS_ANDROID)
96 97
97 #if defined(OS_CHROMEOS) 98 #if defined(OS_CHROMEOS)
98 IN_PROC_BROWSER_TEST_F(MediaColorTest, Yuv420pMpeg4) { 99 IN_PROC_BROWSER_TEST_F(MediaColorTest, Yuv420pMpeg4) {
99 RunColorTest("yuv420p.avi"); 100 RunColorTest("yuv420p.avi");
100 } 101 }
101 #endif // defined(OS_CHROMEOS) 102 #endif // defined(OS_CHROMEOS)
102 #endif // defined(USE_PROPRIETARY_CODECS) 103 #endif // BUILDFLAG(USE_PROPRIETARY_CODECS)
103 104
104 } // namespace content 105 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/media/media_canplaytype_browsertest.cc ('k') | content/browser/media/media_redirect_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698