OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/file_path.h" | 5 #include "base/file_path.h" |
6 | 6 |
7 #include "app/app_switches.h" | 7 #include "app/app_switches.h" |
| 8 #include "base/test/test_timeouts.h" |
8 #include "chrome/common/chrome_switches.h" | 9 #include "chrome/common/chrome_switches.h" |
9 #include "chrome/test/ui/npapi_test_helper.h" | 10 #include "chrome/test/ui/npapi_test_helper.h" |
10 #include "chrome/test/ui_test_utils.h" | 11 #include "chrome/test/ui_test_utils.h" |
11 | 12 |
12 using npapi_test::kTestCompleteCookie; | 13 using npapi_test::kTestCompleteCookie; |
13 using npapi_test::kTestCompleteSuccess; | 14 using npapi_test::kTestCompleteSuccess; |
14 | 15 |
15 // Helper class pepper NPAPI tests. | 16 // Helper class pepper NPAPI tests. |
16 class PepperTester : public NPAPITesterBase { | 17 class PepperTester : public NPAPITesterBase { |
17 protected: | 18 protected: |
(...skipping 16 matching lines...) Expand all Loading... |
34 // and buildbots have OpenGL support. | 35 // and buildbots have OpenGL support. |
35 #if defined(OS_WIN) | 36 #if defined(OS_WIN) |
36 // Marked as FAILS (46662): failing on buildbots but passes on trybots. | 37 // Marked as FAILS (46662): failing on buildbots but passes on trybots. |
37 TEST_F(PepperTester, FAILS_Pepper3D) { | 38 TEST_F(PepperTester, FAILS_Pepper3D) { |
38 const FilePath dir(FILE_PATH_LITERAL("pepper")); | 39 const FilePath dir(FILE_PATH_LITERAL("pepper")); |
39 const FilePath file(FILE_PATH_LITERAL("pepper_3d.html")); | 40 const FilePath file(FILE_PATH_LITERAL("pepper_3d.html")); |
40 GURL url = ui_test_utils::GetTestUrl(dir, file); | 41 GURL url = ui_test_utils::GetTestUrl(dir, file); |
41 ASSERT_NO_FATAL_FAILURE(NavigateToURL(url)); | 42 ASSERT_NO_FATAL_FAILURE(NavigateToURL(url)); |
42 WaitForFinish("pepper_3d", "1", url, | 43 WaitForFinish("pepper_3d", "1", url, |
43 kTestCompleteCookie, kTestCompleteSuccess, | 44 kTestCompleteCookie, kTestCompleteSuccess, |
44 action_max_timeout_ms()); | 45 TestTimeouts::action_max_timeout_ms()); |
45 } | 46 } |
46 #endif | 47 #endif |
OLD | NEW |