| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/test/layout_browsertest.h" | 5 #include "content/test/layout_browsertest.h" |
| 6 | 6 |
| 7 class AudioLayoutTest : public InProcessBrowserLayoutTest { | 7 class AudioLayoutTest : public InProcessBrowserLayoutTest { |
| 8 protected: | 8 protected: |
| 9 AudioLayoutTest() : InProcessBrowserLayoutTest( | 9 AudioLayoutTest() : InProcessBrowserLayoutTest( |
| 10 FilePath(), FilePath().AppendASCII("media")) { | 10 FilePath(), FilePath().AppendASCII("media")) { |
| 11 } | 11 } |
| 12 }; | 12 }; |
| 13 | 13 |
| 14 IN_PROC_BROWSER_TEST_F(AudioLayoutTest, AudioConstructorPreload) { | 14 IN_PROC_BROWSER_TEST_F(AudioLayoutTest, AudioConstructorPreload) { |
| 15 RunLayoutTest("audio-constructor-preload.html"); | 15 RunLayoutTest("audio-constructor-preload.html"); |
| 16 } | 16 } |
| 17 | 17 |
| 18 #if defined(OS_LINUX) && defined(USE_AURA) | |
| 19 // http://crbug.com/154157 | |
| 20 IN_PROC_BROWSER_TEST_F(AudioLayoutTest, AudioConstructor) { | 18 IN_PROC_BROWSER_TEST_F(AudioLayoutTest, AudioConstructor) { |
| 21 RunLayoutTest("audio-constructor.html"); | 19 RunLayoutTest("audio-constructor.html"); |
| 22 } | 20 } |
| 23 | 21 |
| 24 IN_PROC_BROWSER_TEST_F(AudioLayoutTest, AudioConstructorSrc) { | 22 IN_PROC_BROWSER_TEST_F(AudioLayoutTest, AudioConstructorSrc) { |
| 25 RunLayoutTest("audio-constructor-src.html"); | 23 RunLayoutTest("audio-constructor-src.html"); |
| 26 } | 24 } |
| 27 #endif // defined(OS_LINUX) && defined(USE_AURA) | |
| 28 | 25 |
| 29 IN_PROC_BROWSER_TEST_F(AudioLayoutTest, AudioDataUrl) { | 26 IN_PROC_BROWSER_TEST_F(AudioLayoutTest, AudioDataUrl) { |
| 30 RunLayoutTest("audio-data-url.html"); | 27 RunLayoutTest("audio-data-url.html"); |
| 31 } | 28 } |
| 32 | 29 |
| 33 // The test fails since there is no real audio device on the build bots to get | 30 // The test fails since there is no real audio device on the build bots to get |
| 34 // the ended event fired. Should pass once we run it on bots with audio devices. | 31 // the ended event fired. Should pass once we run it on bots with audio devices. |
| 35 IN_PROC_BROWSER_TEST_F(AudioLayoutTest, DISABLED_AudioGarbageCollect) { | 32 IN_PROC_BROWSER_TEST_F(AudioLayoutTest, DISABLED_AudioGarbageCollect) { |
| 36 RunLayoutTest("audio-garbage-collect.html"); | 33 RunLayoutTest("audio-garbage-collect.html"); |
| 37 } | 34 } |
| (...skipping 17 matching lines...) Expand all Loading... |
| 55 RunLayoutTest("audio-play-event.html"); | 52 RunLayoutTest("audio-play-event.html"); |
| 56 } | 53 } |
| 57 | 54 |
| 58 IN_PROC_BROWSER_TEST_F(AudioLayoutTest, MediaCanPlayWavAudio) { | 55 IN_PROC_BROWSER_TEST_F(AudioLayoutTest, MediaCanPlayWavAudio) { |
| 59 RunLayoutTest("media-can-play-wav-audio.html"); | 56 RunLayoutTest("media-can-play-wav-audio.html"); |
| 60 } | 57 } |
| 61 | 58 |
| 62 IN_PROC_BROWSER_TEST_F(AudioLayoutTest, MediaDocumentAudioSize) { | 59 IN_PROC_BROWSER_TEST_F(AudioLayoutTest, MediaDocumentAudioSize) { |
| 63 RunLayoutTest("media-document-audio-size.html"); | 60 RunLayoutTest("media-document-audio-size.html"); |
| 64 } | 61 } |
| OLD | NEW |