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 "chrome/test/nacl/nacl_ui_test.h" | 5 #include "chrome/test/nacl/nacl_ui_test.h" |
6 | 6 |
7 // TODO(jvoung) see what includes we really need. | 7 // TODO(jvoung) see what includes we really need. |
8 #include "base/file_util.h" | 8 #include "base/file_util.h" |
9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
| 10 #include "base/test/test_timeouts.h" |
10 #include "chrome/common/chrome_paths.h" | 11 #include "chrome/common/chrome_paths.h" |
11 | 12 |
12 namespace { | 13 namespace { |
13 // NOTE: The base URL of each HTML file is specified in nacl_test. | 14 // NOTE: The base URL of each HTML file is specified in nacl_test. |
14 const FilePath::CharType kSrpcHwHtmlFileName[] = | 15 const FilePath::CharType kSrpcHwHtmlFileName[] = |
15 FILE_PATH_LITERAL("srpc_hw.html"); | 16 FILE_PATH_LITERAL("srpc_hw.html"); |
16 const FilePath::CharType kSrpcBasicHtmlFileName[] = | 17 const FilePath::CharType kSrpcBasicHtmlFileName[] = |
17 FILE_PATH_LITERAL("srpc_basic.html"); | 18 FILE_PATH_LITERAL("srpc_basic.html"); |
18 const FilePath::CharType kSrpcSockAddrHtmlFileName[] = | 19 const FilePath::CharType kSrpcSockAddrHtmlFileName[] = |
19 FILE_PATH_LITERAL("srpc_sockaddr.html"); | 20 FILE_PATH_LITERAL("srpc_sockaddr.html"); |
(...skipping 10 matching lines...) Expand all Loading... |
30 } // namespace | 31 } // namespace |
31 | 32 |
32 NaClUITest::NaClUITest() { | 33 NaClUITest::NaClUITest() { |
33 } | 34 } |
34 | 35 |
35 NaClUITest::~NaClUITest() { | 36 NaClUITest::~NaClUITest() { |
36 } | 37 } |
37 | 38 |
38 TEST_F(NaClUITest, ServerTest) { | 39 TEST_F(NaClUITest, ServerTest) { |
39 FilePath test_file(kServerHtmlFileName); | 40 FilePath test_file(kServerHtmlFileName); |
40 RunTest(test_file, action_max_timeout_ms()); | 41 RunTest(test_file, TestTimeouts::action_max_timeout_ms()); |
41 } | 42 } |
42 | 43 |
43 TEST_F(NaClUITest, DISABLED_SrpcHelloWorld) { | 44 TEST_F(NaClUITest, DISABLED_SrpcHelloWorld) { |
44 FilePath test_file(kSrpcHwHtmlFileName); | 45 FilePath test_file(kSrpcHwHtmlFileName); |
45 RunTest(test_file, action_max_timeout_ms()); | 46 RunTest(test_file, TestTimeouts::action_max_timeout_ms()); |
46 } | 47 } |
47 | 48 |
48 // http://crbug.com/64973 | 49 // http://crbug.com/64973 |
49 TEST_F(NaClUITest, DISABLED_SrpcBasicTest) { | 50 TEST_F(NaClUITest, DISABLED_SrpcBasicTest) { |
50 FilePath test_file(kSrpcBasicHtmlFileName); | 51 FilePath test_file(kSrpcBasicHtmlFileName); |
51 RunTest(test_file, action_max_timeout_ms()); | 52 RunTest(test_file, TestTimeouts::action_max_timeout_ms()); |
52 } | 53 } |
53 | 54 |
54 TEST_F(NaClUITest, DISABLED_SrpcSockAddrTest) { | 55 TEST_F(NaClUITest, DISABLED_SrpcSockAddrTest) { |
55 FilePath test_file(kSrpcSockAddrHtmlFileName); | 56 FilePath test_file(kSrpcSockAddrHtmlFileName); |
56 RunTest(test_file, action_max_timeout_ms()); | 57 RunTest(test_file, TestTimeouts::action_max_timeout_ms()); |
57 } | 58 } |
58 | 59 |
59 TEST_F(NaClUITest, DISABLED_SrpcShmTest) { | 60 TEST_F(NaClUITest, DISABLED_SrpcShmTest) { |
60 FilePath test_file(kSrpcShmHtmlFileName); | 61 FilePath test_file(kSrpcShmHtmlFileName); |
61 RunTest(test_file, action_max_timeout_ms()); | 62 RunTest(test_file, TestTimeouts::action_max_timeout_ms()); |
62 } | 63 } |
63 | 64 |
64 TEST_F(NaClUITest, DISABLED_SrpcPluginTest) { | 65 TEST_F(NaClUITest, DISABLED_SrpcPluginTest) { |
65 FilePath test_file(kSrpcPluginHtmlFileName); | 66 FilePath test_file(kSrpcPluginHtmlFileName); |
66 RunTest(test_file, action_max_timeout_ms()); | 67 RunTest(test_file, TestTimeouts::action_max_timeout_ms()); |
67 } | 68 } |
68 | 69 |
69 TEST_F(NaClUITest, DISABLED_SrpcNrdXferTest) { | 70 TEST_F(NaClUITest, DISABLED_SrpcNrdXferTest) { |
70 FilePath test_file(kSrpcNrdXferHtmlFileName); | 71 FilePath test_file(kSrpcNrdXferHtmlFileName); |
71 RunTest(test_file, action_max_timeout_ms()); | 72 RunTest(test_file, TestTimeouts::action_max_timeout_ms()); |
72 } | 73 } |
73 | 74 |
74 TEST_F(NaClUITest, DISABLED_NpapiHwTest) { | 75 TEST_F(NaClUITest, DISABLED_NpapiHwTest) { |
75 FilePath test_file(kNpapiHwHtmlFileName); | 76 FilePath test_file(kNpapiHwHtmlFileName); |
76 RunTest(test_file, action_max_timeout_ms()); | 77 RunTest(test_file, TestTimeouts::action_max_timeout_ms()); |
77 } | 78 } |
78 | 79 |
79 TEST_F(NaClUITest, DISABLED_MultiarchTest) { | 80 TEST_F(NaClUITest, DISABLED_MultiarchTest) { |
80 FilePath test_file(kSrpcHwHtmlFileName); | 81 FilePath test_file(kSrpcHwHtmlFileName); |
81 RunMultiarchTest(test_file, action_max_timeout_ms()); | 82 RunMultiarchTest(test_file, TestTimeouts::action_max_timeout_ms()); |
82 } | 83 } |
83 | 84 |
OLD | NEW |