| 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 "base/basictypes.h" | 5 #include "base/basictypes.h" |
| 6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
| 7 #include "base/string16.h" | 7 #include "base/string16.h" |
| 8 #include "base/string_util.h" | 8 #include "base/string_util.h" |
| 9 #include "base/stringprintf.h" | 9 #include "base/stringprintf.h" |
| 10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 } | 70 } |
| 71 | 71 |
| 72 IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_AudioOnly_WebM) { | 72 IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_AudioOnly_WebM) { |
| 73 TestSimplePlayback("bear-320x240-audio-only.webm", kWebMAudioOnly, kEnded); | 73 TestSimplePlayback("bear-320x240-audio-only.webm", kWebMAudioOnly, kEnded); |
| 74 } | 74 } |
| 75 | 75 |
| 76 IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_Type_Error) { | 76 IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_Type_Error) { |
| 77 TestSimplePlayback("bear-320x240-video-only.webm", kWebMAudioOnly, kError); | 77 TestSimplePlayback("bear-320x240-video-only.webm", kWebMAudioOnly, kError); |
| 78 } | 78 } |
| 79 | 79 |
| 80 IN_PROC_BROWSER_TEST_F(MediaSourceTest, ConfigChangeVideo) { | 80 IN_PROC_BROWSER_TEST_F(MediaSourceTest, DISABLED_ConfigChangeVideo) { |
| 81 ASSERT_NO_FATAL_FAILURE( | 81 ASSERT_NO_FATAL_FAILURE( |
| 82 RunTest("mse_config_change.html", NULL, NULL, kEnded)); | 82 RunTest("mse_config_change.html", NULL, NULL, kEnded)); |
| 83 } | 83 } |
| 84 | 84 |
| 85 } // namespace content | 85 } // namespace content |
| OLD | NEW |