| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 "content/browser/media/media_browsertest.h" | 5 #include "content/browser/media/media_browsertest.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/strings/string_number_conversions.h" | 8 #include "base/strings/string_number_conversions.h" |
| 9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
| 10 #include "build/build_config.h" | 10 #include "build/build_config.h" |
| (...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 137 PlayVideo("bear-320x180-hi10p-vp9.webm", GetParam()); | 137 PlayVideo("bear-320x180-hi10p-vp9.webm", GetParam()); |
| 138 } | 138 } |
| 139 | 139 |
| 140 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBear12DepthVP9) { | 140 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBear12DepthVP9) { |
| 141 PlayVideo("bear-320x180-hi12p-vp9.webm", GetParam()); | 141 PlayVideo("bear-320x180-hi12p-vp9.webm", GetParam()); |
| 142 } | 142 } |
| 143 #endif | 143 #endif |
| 144 | 144 |
| 145 #if BUILDFLAG(USE_PROPRIETARY_CODECS) | 145 #if BUILDFLAG(USE_PROPRIETARY_CODECS) |
| 146 // Crashes on Mac http://crbug.com/621857 | 146 // Crashes on Mac http://crbug.com/621857 |
| 147 // Fails on Android http://crbug.com/682387 | 147 #if defined(OS_MACOSX) |
| 148 #if defined(OS_MACOSX) || defined(OS_ANDROID) | |
| 149 #define MAYBE_VideoBearMp4 DISABLED_VideoBearMp4 | 148 #define MAYBE_VideoBearMp4 DISABLED_VideoBearMp4 |
| 150 #else | 149 #else |
| 151 #define MAYBE_VideoBearMp4 VideoBearMp4 | 150 #define MAYBE_VideoBearMp4 VideoBearMp4 |
| 152 #endif | 151 #endif |
| 153 IN_PROC_BROWSER_TEST_P(MediaTest, MAYBE_VideoBearMp4) { | 152 IN_PROC_BROWSER_TEST_P(MediaTest, MAYBE_VideoBearMp4) { |
| 154 PlayVideo("bear.mp4", GetParam()); | 153 PlayVideo("bear.mp4", GetParam()); |
| 155 } | 154 } |
| 156 | 155 |
| 157 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearMp4Vp9) { | 156 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearMp4Vp9) { |
| 158 PlayVideo("bear-320x240-v_frag-vp9.mp4", GetParam()); | 157 PlayVideo("bear-320x240-v_frag-vp9.mp4", GetParam()); |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 263 IN_PROC_BROWSER_TEST_F(MediaTest, Navigate) { | 262 IN_PROC_BROWSER_TEST_F(MediaTest, Navigate) { |
| 264 PlayVideo("bear.webm", false); | 263 PlayVideo("bear.webm", false); |
| 265 NavigateToURL(shell(), GURL(url::kAboutBlankURL)); | 264 NavigateToURL(shell(), GURL(url::kAboutBlankURL)); |
| 266 EXPECT_FALSE(shell()->web_contents()->IsCrashed()); | 265 EXPECT_FALSE(shell()->web_contents()->IsCrashed()); |
| 267 } | 266 } |
| 268 | 267 |
| 269 INSTANTIATE_TEST_CASE_P(File, MediaTest, ::testing::Values(false)); | 268 INSTANTIATE_TEST_CASE_P(File, MediaTest, ::testing::Values(false)); |
| 270 INSTANTIATE_TEST_CASE_P(Http, MediaTest, ::testing::Values(true)); | 269 INSTANTIATE_TEST_CASE_P(Http, MediaTest, ::testing::Values(true)); |
| 271 | 270 |
| 272 } // namespace content | 271 } // namespace content |
| OLD | NEW |