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 "base/path_service.h" | 5 #include "base/path_service.h" |
6 #include "base/test/test_timeouts.h" | 6 #include "base/test/test_timeouts.h" |
7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
8 #include "chrome/browser/extensions/extension_browsertest.h" | 8 #include "chrome/browser/extensions/extension_browsertest.h" |
9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
(...skipping 1201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1212 #define MAYBE_Compositor1 DISABLED_Compositor1 | 1212 #define MAYBE_Compositor1 DISABLED_Compositor1 |
1213 #else | 1213 #else |
1214 // flaky on Linux: http://crbug.com/396482 | 1214 // flaky on Linux: http://crbug.com/396482 |
1215 #define MAYBE_Compositor0 DISABLED_Compositor0 | 1215 #define MAYBE_Compositor0 DISABLED_Compositor0 |
1216 #define MAYBE_Compositor1 DISABLED_Compositor1 | 1216 #define MAYBE_Compositor1 DISABLED_Compositor1 |
1217 #endif | 1217 #endif |
1218 | 1218 |
1219 TEST_PPAPI_NACL_SUBTESTS(MAYBE_Compositor0, RUN_COMPOSITOR_SUBTESTS_0) | 1219 TEST_PPAPI_NACL_SUBTESTS(MAYBE_Compositor0, RUN_COMPOSITOR_SUBTESTS_0) |
1220 TEST_PPAPI_NACL_SUBTESTS(MAYBE_Compositor1, RUN_COMPOSITOR_SUBTESTS_1) | 1220 TEST_PPAPI_NACL_SUBTESTS(MAYBE_Compositor1, RUN_COMPOSITOR_SUBTESTS_1) |
1221 | 1221 |
1222 #if defined(OS_WIN) | 1222 #if defined(OS_LINUX) || defined(OS_WIN) |
1223 // Flaky on Windows (crbug.com/438729) | 1223 // Flaky on Linux and Windows (crbug.com/438729) |
1224 #define MAYBE_MediaStreamAudioTrack DISABLED_MediaStreamAudioTrack | 1224 #define MAYBE_MediaStreamAudioTrack DISABLED_MediaStreamAudioTrack |
1225 #else | 1225 #else |
1226 #define MAYBE_MediaStreamAudioTrack MediaStreamAudioTrack | 1226 #define MAYBE_MediaStreamAudioTrack MediaStreamAudioTrack |
1227 #endif | 1227 #endif |
1228 TEST_PPAPI_NACL(MAYBE_MediaStreamAudioTrack) | 1228 TEST_PPAPI_NACL(MAYBE_MediaStreamAudioTrack) |
1229 | 1229 |
1230 TEST_PPAPI_NACL(MediaStreamVideoTrack) | 1230 TEST_PPAPI_NACL(MediaStreamVideoTrack) |
1231 | 1231 |
1232 TEST_PPAPI_NACL(MouseCursor) | 1232 TEST_PPAPI_NACL(MouseCursor) |
1233 | 1233 |
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1430 #endif | 1430 #endif |
1431 | 1431 |
1432 IN_PROC_BROWSER_TEST_F(MojoPPAPITest, MAYBE_MOJO(Mojo)) { | 1432 IN_PROC_BROWSER_TEST_F(MojoPPAPITest, MAYBE_MOJO(Mojo)) { |
1433 RunTest(); | 1433 RunTest(); |
1434 } | 1434 } |
1435 | 1435 |
1436 IN_PROC_BROWSER_TEST_F(MojoPPAPITest, MAYBE_MOJO(MojoFailsWithoutFlag)) { | 1436 IN_PROC_BROWSER_TEST_F(MojoPPAPITest, MAYBE_MOJO(MojoFailsWithoutFlag)) { |
1437 RunTestWithoutFlag(); | 1437 RunTestWithoutFlag(); |
1438 } | 1438 } |
1439 #endif | 1439 #endif |
OLD | NEW |