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 19 matching lines...) Expand all Loading... | |
30 | 30 |
31 // This macro finesses macro expansion to do what we want. | 31 // This macro finesses macro expansion to do what we want. |
32 #define STRIP_PREFIXES(test_name) ppapi::StripTestPrefixes(#test_name) | 32 #define STRIP_PREFIXES(test_name) ppapi::StripTestPrefixes(#test_name) |
33 // Turn the given token into a string. This allows us to use precompiler stuff | 33 // Turn the given token into a string. This allows us to use precompiler stuff |
34 // to turn names into DISABLED_Foo, but still pass a string to RunTest. | 34 // to turn names into DISABLED_Foo, but still pass a string to RunTest. |
35 #define STRINGIFY(test_name) #test_name | 35 #define STRINGIFY(test_name) #test_name |
36 #define LIST_TEST(test_name) STRINGIFY(test_name) "," | 36 #define LIST_TEST(test_name) STRINGIFY(test_name) "," |
37 | 37 |
38 // Use these macros to run the tests for a specific interface. | 38 // Use these macros to run the tests for a specific interface. |
39 // Most interfaces should be tested with both macros. | 39 // Most interfaces should be tested with both macros. |
40 #define TEST_PPAPI_IN_PROCESS(test_name) \ | |
41 IN_PROC_BROWSER_TEST_F(PPAPITest, test_name) { \ | |
42 RunTest(STRIP_PREFIXES(test_name)); \ | |
43 } | |
44 #define TEST_PPAPI_OUT_OF_PROCESS(test_name) \ | 40 #define TEST_PPAPI_OUT_OF_PROCESS(test_name) \ |
45 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, test_name) { \ | 41 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, test_name) { \ |
46 RunTest(STRIP_PREFIXES(test_name)); \ | 42 RunTest(STRIP_PREFIXES(test_name)); \ |
47 } | 43 } |
48 | 44 |
49 // Similar macros that test over HTTP. | 45 // Similar macros that test over HTTP. |
50 #define TEST_PPAPI_IN_PROCESS_VIA_HTTP(test_name) \ | |
51 IN_PROC_BROWSER_TEST_F(PPAPITest, test_name) { \ | |
52 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \ | |
53 } | |
54 #define TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(test_name) \ | 46 #define TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(test_name) \ |
55 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, test_name) { \ | 47 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, test_name) { \ |
56 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \ | 48 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \ |
57 } | 49 } |
58 | 50 |
59 // Similar macros that test with an SSL server. | 51 // Similar macros that test with an SSL server. |
60 #define TEST_PPAPI_IN_PROCESS_WITH_SSL_SERVER(test_name) \ | |
61 IN_PROC_BROWSER_TEST_F(PPAPITest, test_name) { \ | |
62 RunTestWithSSLServer(STRIP_PREFIXES(test_name)); \ | |
63 } | |
dmichael (off chromium)
2015/02/13 17:12:01
^^^ We can definitely kill off these IN_PROCESS te
| |
64 #define TEST_PPAPI_OUT_OF_PROCESS_WITH_SSL_SERVER(test_name) \ | 52 #define TEST_PPAPI_OUT_OF_PROCESS_WITH_SSL_SERVER(test_name) \ |
65 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, test_name) { \ | 53 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, test_name) { \ |
66 RunTestWithSSLServer(STRIP_PREFIXES(test_name)); \ | 54 RunTestWithSSLServer(STRIP_PREFIXES(test_name)); \ |
67 } | 55 } |
68 | 56 |
69 #if defined(DISABLE_NACL) | 57 #if defined(DISABLE_NACL) |
70 | 58 |
71 #define TEST_PPAPI_NACL(test_name) | 59 #define TEST_PPAPI_NACL(test_name) |
72 #define TEST_PPAPI_NACL_DISALLOWED_SOCKETS(test_name) | 60 #define TEST_PPAPI_NACL_DISALLOWED_SOCKETS(test_name) |
73 #define TEST_PPAPI_NACL_WITH_SSL_SERVER(test_name) | 61 #define TEST_PPAPI_NACL_WITH_SSL_SERVER(test_name) |
74 #define TEST_PPAPI_NACL_SUBTESTS(test_name, run_statement) | 62 #define TEST_PPAPI_NACL_SUBTESTS(test_name, run_statement) |
75 | 63 |
76 #else | 64 #else |
77 | 65 |
78 // NaCl based PPAPI tests | 66 // NaCl based PPAPI tests |
79 #define TEST_PPAPI_NACL(test_name) \ | 67 #define TEST_PPAPI_NACL(test_name) \ |
80 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, test_name) { \ | 68 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, test_name) { \ |
81 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \ | 69 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \ |
82 } \ | 70 } \ |
83 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(test_name)) { \ | |
84 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \ | |
85 } \ | |
86 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, test_name) { \ | 71 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, test_name) { \ |
87 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \ | 72 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \ |
88 } \ | 73 } \ |
89 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, \ | 74 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, \ |
90 MAYBE_PNACL_NONSFI(test_name)) { \ | 75 MAYBE_PNACL_NONSFI(test_name)) { \ |
91 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \ | 76 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \ |
92 } \ | 77 } \ |
93 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest, \ | 78 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest, \ |
94 MAYBE_PNACL_TRANSITIONAL_NONSFI(test_name)) { \ | 79 MAYBE_PNACL_TRANSITIONAL_NONSFI(test_name)) { \ |
95 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \ | 80 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \ |
96 } | 81 } |
97 | 82 |
98 // NaCl based PPAPI tests | 83 // NaCl based PPAPI tests |
99 #define TEST_PPAPI_NACL_SUBTESTS(test_name, run_statement) \ | 84 #define TEST_PPAPI_NACL_SUBTESTS(test_name, run_statement) \ |
100 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, test_name) { \ | 85 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, test_name) { \ |
101 run_statement; \ | 86 run_statement; \ |
102 } \ | 87 } \ |
103 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(test_name)) { \ | |
104 run_statement; \ | |
105 } \ | |
106 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, test_name) { \ | 88 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, test_name) { \ |
107 run_statement; \ | 89 run_statement; \ |
108 } \ | 90 } \ |
109 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, \ | 91 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, \ |
110 MAYBE_PNACL_NONSFI(test_name)) { \ | 92 MAYBE_PNACL_NONSFI(test_name)) { \ |
111 run_statement; \ | 93 run_statement; \ |
112 } \ | 94 } \ |
113 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest, \ | 95 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest, \ |
114 MAYBE_PNACL_TRANSITIONAL_NONSFI(test_name)) { \ | 96 MAYBE_PNACL_TRANSITIONAL_NONSFI(test_name)) { \ |
115 run_statement; \ | 97 run_statement; \ |
116 } | 98 } |
117 | 99 |
118 // NaCl based PPAPI tests with disallowed socket API | 100 // NaCl based PPAPI tests with disallowed socket API |
119 #define TEST_PPAPI_NACL_DISALLOWED_SOCKETS(test_name) \ | 101 #define TEST_PPAPI_NACL_DISALLOWED_SOCKETS(test_name) \ |
120 IN_PROC_BROWSER_TEST_F(PPAPINaClTestDisallowedSockets, test_name) { \ | 102 IN_PROC_BROWSER_TEST_F(PPAPINaClTestDisallowedSockets, test_name) { \ |
121 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \ | 103 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \ |
122 } | 104 } |
123 | 105 |
124 // NaCl based PPAPI tests with SSL server | 106 // NaCl based PPAPI tests with SSL server |
125 #define TEST_PPAPI_NACL_WITH_SSL_SERVER(test_name) \ | 107 #define TEST_PPAPI_NACL_WITH_SSL_SERVER(test_name) \ |
126 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, test_name) { \ | 108 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, test_name) { \ |
127 RunTestWithSSLServer(STRIP_PREFIXES(test_name)); \ | 109 RunTestWithSSLServer(STRIP_PREFIXES(test_name)); \ |
128 } \ | 110 } \ |
129 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(test_name)) { \ | |
130 RunTestWithSSLServer(STRIP_PREFIXES(test_name)); \ | |
131 } \ | |
132 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, test_name) { \ | 111 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, test_name) { \ |
133 RunTestWithSSLServer(STRIP_PREFIXES(test_name)); \ | 112 RunTestWithSSLServer(STRIP_PREFIXES(test_name)); \ |
134 } \ | 113 } \ |
135 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, \ | 114 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, \ |
136 MAYBE_PNACL_NONSFI(test_name)) { \ | 115 MAYBE_PNACL_NONSFI(test_name)) { \ |
137 RunTestWithSSLServer(STRIP_PREFIXES(test_name)); \ | 116 RunTestWithSSLServer(STRIP_PREFIXES(test_name)); \ |
138 } \ | 117 } \ |
139 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest, \ | 118 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest, \ |
140 MAYBE_PNACL_TRANSITIONAL_NONSFI(test_name)) { \ | 119 MAYBE_PNACL_TRANSITIONAL_NONSFI(test_name)) { \ |
141 RunTestWithSSLServer(STRIP_PREFIXES(test_name)); \ | 120 RunTestWithSSLServer(STRIP_PREFIXES(test_name)); \ |
142 } | 121 } |
143 | 122 |
144 | 123 |
145 #endif // DISABLE_NACL | 124 #endif // DISABLE_NACL |
146 | 125 |
147 // | 126 // |
148 // Interface tests. | 127 // Interface tests. |
149 // | 128 // |
150 | 129 |
151 TEST_PPAPI_IN_PROCESS(Broker) | |
152 // Flaky, http://crbug.com/111355 | 130 // Flaky, http://crbug.com/111355 |
153 TEST_PPAPI_OUT_OF_PROCESS(DISABLED_Broker) | 131 TEST_PPAPI_OUT_OF_PROCESS(DISABLED_Broker) |
154 | 132 |
155 IN_PROC_BROWSER_TEST_F(PPAPIBrokerInfoBarTest, Accept) { | 133 IN_PROC_BROWSER_TEST_F(PPAPIBrokerInfoBarTest, Accept) { |
156 // Accepting the infobar should grant permission to access the PPAPI broker. | 134 // Accepting the infobar should grant permission to access the PPAPI broker. |
157 InfoBarObserver observer(this); | 135 InfoBarObserver observer(this); |
158 observer.ExpectInfoBarAndAccept(true); | 136 observer.ExpectInfoBarAndAccept(true); |
159 | 137 |
160 // PPB_Broker_Trusted::IsAllowed should return false before the infobar is | 138 // PPB_Broker_Trusted::IsAllowed should return false before the infobar is |
161 // popped and true after the infobar is popped. | 139 // popped and true after the infobar is popped. |
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
268 // software compositor is enabled crbug.com/286038 | 246 // software compositor is enabled crbug.com/286038 |
269 #define MAYBE_IN_Graphics3D DISABLED_Graphics3D | 247 #define MAYBE_IN_Graphics3D DISABLED_Graphics3D |
270 #define MAYBE_OUT_Graphics3D DISABLED_Graphics3D | 248 #define MAYBE_OUT_Graphics3D DISABLED_Graphics3D |
271 #define MAYBE_NACL_Graphics3D DISABLED_Graphics3D | 249 #define MAYBE_NACL_Graphics3D DISABLED_Graphics3D |
272 #else | 250 #else |
273 // The tests are failing in-process. crbug.com/280282 | 251 // The tests are failing in-process. crbug.com/280282 |
274 #define MAYBE_IN_Graphics3D DISABLED_Graphics3D | 252 #define MAYBE_IN_Graphics3D DISABLED_Graphics3D |
275 #define MAYBE_OUT_Graphics3D Graphics3D | 253 #define MAYBE_OUT_Graphics3D Graphics3D |
276 #define MAYBE_NACL_Graphics3D Graphics3D | 254 #define MAYBE_NACL_Graphics3D Graphics3D |
277 #endif | 255 #endif |
278 TEST_PPAPI_IN_PROCESS(MAYBE_IN_Graphics3D) | |
279 TEST_PPAPI_OUT_OF_PROCESS(MAYBE_OUT_Graphics3D) | 256 TEST_PPAPI_OUT_OF_PROCESS(MAYBE_OUT_Graphics3D) |
280 TEST_PPAPI_NACL(MAYBE_NACL_Graphics3D) | 257 TEST_PPAPI_NACL(MAYBE_NACL_Graphics3D) |
281 | 258 |
282 TEST_PPAPI_NACL(ImageData) | 259 TEST_PPAPI_NACL(ImageData) |
283 | 260 |
284 // TCPSocket and TCPSocketPrivate tests. | 261 // TCPSocket and TCPSocketPrivate tests. |
285 #define RUN_TCPSOCKET_SUBTESTS \ | 262 #define RUN_TCPSOCKET_SUBTESTS \ |
286 RunTestViaHTTP( \ | 263 RunTestViaHTTP( \ |
287 LIST_TEST(TCPSocket_Connect) \ | 264 LIST_TEST(TCPSocket_Connect) \ |
288 LIST_TEST(TCPSocket_ReadWrite) \ | 265 LIST_TEST(TCPSocket_ReadWrite) \ |
289 LIST_TEST(TCPSocket_SetOption) \ | 266 LIST_TEST(TCPSocket_SetOption) \ |
290 LIST_TEST(TCPSocket_Listen) \ | 267 LIST_TEST(TCPSocket_Listen) \ |
291 LIST_TEST(TCPSocket_Backlog) \ | 268 LIST_TEST(TCPSocket_Backlog) \ |
292 LIST_TEST(TCPSocket_Interface_1_0) \ | 269 LIST_TEST(TCPSocket_Interface_1_0) \ |
293 ) | 270 ) |
294 | 271 |
295 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, TCPSocket) { | 272 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, TCPSocket) { |
296 RUN_TCPSOCKET_SUBTESTS; | 273 RUN_TCPSOCKET_SUBTESTS; |
297 } | 274 } |
298 #if defined(OS_MACOSX) && defined(ADDRESS_SANITIZER) | 275 #if defined(OS_MACOSX) && defined(ADDRESS_SANITIZER) |
299 // Flaky on Mac ASAN: http://crbug.com/437408 and http://crbug.com/457501. | 276 // Flaky on Mac ASAN: http://crbug.com/437408 and http://crbug.com/457501. |
300 #define MAYBE_TCPSocket DISABLED_TCPSocket | 277 #define MAYBE_TCPSocket DISABLED_TCPSocket |
301 #else | 278 #else |
302 #define MAYBE_TCPSocket TCPSocket | 279 #define MAYBE_TCPSocket TCPSocket |
303 #endif | 280 #endif |
304 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, MAYBE_TCPSocket) { | 281 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, MAYBE_TCPSocket) { |
305 RUN_TCPSOCKET_SUBTESTS; | 282 RUN_TCPSOCKET_SUBTESTS; |
306 } | 283 } |
307 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(MAYBE_TCPSocket)) { | |
308 RUN_TCPSOCKET_SUBTESTS; | |
309 } | |
310 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, TCPSocket) { | 284 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, TCPSocket) { |
311 RUN_TCPSOCKET_SUBTESTS; | 285 RUN_TCPSOCKET_SUBTESTS; |
312 } | 286 } |
313 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, | 287 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, |
314 MAYBE_PNACL_NONSFI(TCPSocket)) { | 288 MAYBE_PNACL_NONSFI(TCPSocket)) { |
315 RUN_TCPSOCKET_SUBTESTS; | 289 RUN_TCPSOCKET_SUBTESTS; |
316 } | 290 } |
317 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest, | 291 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest, |
318 MAYBE_PNACL_TRANSITIONAL_NONSFI(TCPSocket)) { | 292 MAYBE_PNACL_TRANSITIONAL_NONSFI(TCPSocket)) { |
319 RUN_TCPSOCKET_SUBTESTS; | 293 RUN_TCPSOCKET_SUBTESTS; |
(...skipping 30 matching lines...) Expand all Loading... | |
350 LIST_TEST(UDPSocket_SetOption) \ | 324 LIST_TEST(UDPSocket_SetOption) \ |
351 LIST_TEST(MAYBE_UDPSocket_Broadcast) \ | 325 LIST_TEST(MAYBE_UDPSocket_Broadcast) \ |
352 LIST_TEST(UDPSocket_ParallelSend)) | 326 LIST_TEST(UDPSocket_ParallelSend)) |
353 | 327 |
354 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, UDPSocket) { | 328 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, UDPSocket) { |
355 RUN_UDPSOCKET_SUBTESTS; | 329 RUN_UDPSOCKET_SUBTESTS; |
356 } | 330 } |
357 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, UDPSocket) { | 331 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, UDPSocket) { |
358 RUN_UDPSOCKET_SUBTESTS; | 332 RUN_UDPSOCKET_SUBTESTS; |
359 } | 333 } |
360 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(UDPSocket)) { | |
361 RUN_UDPSOCKET_SUBTESTS; | |
362 } | |
363 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, UDPSocket) { | 334 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, UDPSocket) { |
364 RUN_UDPSOCKET_SUBTESTS; | 335 RUN_UDPSOCKET_SUBTESTS; |
365 } | 336 } |
366 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, | 337 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, |
367 MAYBE_PNACL_NONSFI(UDPSocket)) { | 338 MAYBE_PNACL_NONSFI(UDPSocket)) { |
368 RUN_UDPSOCKET_SUBTESTS; | 339 RUN_UDPSOCKET_SUBTESTS; |
369 } | 340 } |
370 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest, | 341 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest, |
371 MAYBE_PNACL_TRANSITIONAL_NONSFI(UDPSocket)) { | 342 MAYBE_PNACL_TRANSITIONAL_NONSFI(UDPSocket)) { |
372 RUN_UDPSOCKET_SUBTESTS; | 343 RUN_UDPSOCKET_SUBTESTS; |
(...skipping 29 matching lines...) Expand all Loading... | |
402 LIST_TEST(HostResolver_Resolve) \ | 373 LIST_TEST(HostResolver_Resolve) \ |
403 LIST_TEST(HostResolver_ResolveIPv4) \ | 374 LIST_TEST(HostResolver_ResolveIPv4) \ |
404 ) | 375 ) |
405 | 376 |
406 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, HostResolver) { | 377 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, HostResolver) { |
407 RUN_HOST_RESOLVER_SUBTESTS; | 378 RUN_HOST_RESOLVER_SUBTESTS; |
408 } | 379 } |
409 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, HostResolver) { | 380 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, HostResolver) { |
410 RUN_HOST_RESOLVER_SUBTESTS; | 381 RUN_HOST_RESOLVER_SUBTESTS; |
411 } | 382 } |
412 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(HostResolver)) { | |
413 RUN_HOST_RESOLVER_SUBTESTS; | |
414 } | |
415 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, HostResolver) { | 383 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, HostResolver) { |
416 RUN_HOST_RESOLVER_SUBTESTS; | 384 RUN_HOST_RESOLVER_SUBTESTS; |
417 } | 385 } |
418 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, | 386 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, |
419 MAYBE_PNACL_NONSFI(HostResolver)) { | 387 MAYBE_PNACL_NONSFI(HostResolver)) { |
420 RUN_HOST_RESOLVER_SUBTESTS; | 388 RUN_HOST_RESOLVER_SUBTESTS; |
421 } | 389 } |
422 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest, | 390 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest, |
423 MAYBE_PNACL_TRANSITIONAL_NONSFI(HostResolver)) { | 391 MAYBE_PNACL_TRANSITIONAL_NONSFI(HostResolver)) { |
424 RUN_HOST_RESOLVER_SUBTESTS; | 392 RUN_HOST_RESOLVER_SUBTESTS; |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
481 // XRequestedWithHeader isn't trusted per-se, but the header isn't provided | 449 // XRequestedWithHeader isn't trusted per-se, but the header isn't provided |
482 // for NaCl and thus must be skipped. | 450 // for NaCl and thus must be skipped. |
483 #define RUN_URLLOADER_TRUSTED_SUBTESTS \ | 451 #define RUN_URLLOADER_TRUSTED_SUBTESTS \ |
484 RunTestViaHTTP( \ | 452 RunTestViaHTTP( \ |
485 LIST_TEST(URLLoader_TrustedSameOriginRestriction) \ | 453 LIST_TEST(URLLoader_TrustedSameOriginRestriction) \ |
486 LIST_TEST(URLLoader_TrustedCrossOriginRequest) \ | 454 LIST_TEST(URLLoader_TrustedCrossOriginRequest) \ |
487 LIST_TEST(URLLoader_TrustedHttpRequests) \ | 455 LIST_TEST(URLLoader_TrustedHttpRequests) \ |
488 LIST_TEST(URLLoader_XRequestedWithHeader) \ | 456 LIST_TEST(URLLoader_XRequestedWithHeader) \ |
489 ) | 457 ) |
490 | 458 |
491 IN_PROC_BROWSER_TEST_F(PPAPITest, URLLoader0) { | |
492 RUN_URLLOADER_SUBTESTS_0; | |
493 } | |
494 IN_PROC_BROWSER_TEST_F(PPAPITest, URLLoader1) { | |
495 RUN_URLLOADER_SUBTESTS_1; | |
496 } | |
497 IN_PROC_BROWSER_TEST_F(PPAPITest, URLLoader2) { | |
498 RUN_URLLOADER_SUBTESTS_2; | |
499 } | |
500 IN_PROC_BROWSER_TEST_F(PPAPITest, URLLoader3) { | |
501 RUN_URLLOADER_SUBTESTS_3; | |
502 } | |
503 IN_PROC_BROWSER_TEST_F(PPAPITest, URLLoaderTrusted) { | |
504 RUN_URLLOADER_TRUSTED_SUBTESTS; | |
505 } | |
506 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, URLLoader0) { | 459 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, URLLoader0) { |
507 RUN_URLLOADER_SUBTESTS_0; | 460 RUN_URLLOADER_SUBTESTS_0; |
508 } | 461 } |
509 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, URLLoader1) { | 462 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, URLLoader1) { |
510 RUN_URLLOADER_SUBTESTS_1; | 463 RUN_URLLOADER_SUBTESTS_1; |
511 } | 464 } |
512 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, URLLoader2) { | 465 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, URLLoader2) { |
513 RUN_URLLOADER_SUBTESTS_2; | 466 RUN_URLLOADER_SUBTESTS_2; |
514 } | 467 } |
515 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, URLLoader3) { | 468 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, URLLoader3) { |
(...skipping 20 matching lines...) Expand all Loading... | |
536 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, MAYBE_URLLoader3) { | 489 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, MAYBE_URLLoader3) { |
537 RUN_URLLOADER_SUBTESTS_3; | 490 RUN_URLLOADER_SUBTESTS_3; |
538 } | 491 } |
539 | 492 |
540 // Flaky on 32-bit linux bot; http://crbug.com/308906 | 493 // Flaky on 32-bit linux bot; http://crbug.com/308906 |
541 #if defined(OS_LINUX) && defined(ARCH_CPU_X86) | 494 #if defined(OS_LINUX) && defined(ARCH_CPU_X86) |
542 #define MAYBE_URLLoader_BasicFilePOST DISABLED_URLLoader_BasicFilePOST | 495 #define MAYBE_URLLoader_BasicFilePOST DISABLED_URLLoader_BasicFilePOST |
543 #else | 496 #else |
544 #define MAYBE_URLLoader_BasicFilePOST URLLoader_BasicFilePOST | 497 #define MAYBE_URLLoader_BasicFilePOST URLLoader_BasicFilePOST |
545 #endif | 498 #endif |
546 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(URLLoader0)) { | |
547 RunTestViaHTTP( | |
548 LIST_TEST(URLLoader_BasicGET) | |
549 LIST_TEST(URLLoader_BasicPOST) | |
550 LIST_TEST(MAYBE_URLLoader_BasicFilePOST) | |
551 LIST_TEST(URLLoader_BasicFileRangePOST) | |
552 LIST_TEST(URLLoader_CompoundBodyPOST) | |
553 ); | |
554 } | |
555 | 499 |
556 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(URLLoader1)) { | |
557 RUN_URLLOADER_SUBTESTS_1; | |
558 } | |
559 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(URLLoader2)) { | |
560 RUN_URLLOADER_SUBTESTS_2; | |
561 } | |
562 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(URLLoader3)) { | |
563 RUN_URLLOADER_SUBTESTS_3; | |
564 } | |
565 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, URLLoader0) { | 500 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, URLLoader0) { |
566 RUN_URLLOADER_SUBTESTS_0; | 501 RUN_URLLOADER_SUBTESTS_0; |
567 } | 502 } |
568 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, URLLoader1) { | 503 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, URLLoader1) { |
569 RUN_URLLOADER_SUBTESTS_1; | 504 RUN_URLLOADER_SUBTESTS_1; |
570 } | 505 } |
571 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, URLLoader2) { | 506 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, URLLoader2) { |
572 RUN_URLLOADER_SUBTESTS_2; | 507 RUN_URLLOADER_SUBTESTS_2; |
573 } | 508 } |
574 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, URLLoader3) { | 509 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, URLLoader3) { |
(...skipping 27 matching lines...) Expand all Loading... | |
602 MAYBE_PNACL_TRANSITIONAL_NONSFI(URLLoader2)) { | 537 MAYBE_PNACL_TRANSITIONAL_NONSFI(URLLoader2)) { |
603 RUN_URLLOADER_SUBTESTS_2; | 538 RUN_URLLOADER_SUBTESTS_2; |
604 } | 539 } |
605 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest, | 540 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest, |
606 MAYBE_PNACL_TRANSITIONAL_NONSFI(URLLoader3)) { | 541 MAYBE_PNACL_TRANSITIONAL_NONSFI(URLLoader3)) { |
607 RUN_URLLOADER_SUBTESTS_3; | 542 RUN_URLLOADER_SUBTESTS_3; |
608 } | 543 } |
609 | 544 |
610 | 545 |
611 // URLRequestInfo tests. | 546 // URLRequestInfo tests. |
612 TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLRequest_CreateAndIsURLRequestInfo) | |
613 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLRequest_CreateAndIsURLRequestInfo) | 547 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLRequest_CreateAndIsURLRequestInfo) |
614 | 548 |
615 // Timing out on Windows. http://crbug.com/129571 | 549 // Timing out on Windows. http://crbug.com/129571 |
616 #if defined(OS_WIN) | 550 #if defined(OS_WIN) |
617 #define MAYBE_URLRequest_CreateAndIsURLRequestInfo \ | 551 #define MAYBE_URLRequest_CreateAndIsURLRequestInfo \ |
618 DISABLED_URLRequest_CreateAndIsURLRequestInfo | 552 DISABLED_URLRequest_CreateAndIsURLRequestInfo |
619 #else | 553 #else |
620 #define MAYBE_URLRequest_CreateAndIsURLRequestInfo \ | 554 #define MAYBE_URLRequest_CreateAndIsURLRequestInfo \ |
621 URLRequest_CreateAndIsURLRequestInfo | 555 URLRequest_CreateAndIsURLRequestInfo |
622 #endif | 556 #endif |
623 TEST_PPAPI_NACL(MAYBE_URLRequest_CreateAndIsURLRequestInfo) | 557 TEST_PPAPI_NACL(MAYBE_URLRequest_CreateAndIsURLRequestInfo) |
624 | 558 |
625 TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLRequest_SetProperty) | |
626 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLRequest_SetProperty) | 559 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLRequest_SetProperty) |
627 TEST_PPAPI_NACL(URLRequest_SetProperty) | 560 TEST_PPAPI_NACL(URLRequest_SetProperty) |
628 TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLRequest_AppendDataToBody) | |
629 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLRequest_AppendDataToBody) | 561 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLRequest_AppendDataToBody) |
630 TEST_PPAPI_NACL(URLRequest_AppendDataToBody) | 562 TEST_PPAPI_NACL(URLRequest_AppendDataToBody) |
631 TEST_PPAPI_IN_PROCESS_VIA_HTTP(DISABLED_URLRequest_AppendFileToBody) | |
632 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(DISABLED_URLRequest_AppendFileToBody) | 563 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(DISABLED_URLRequest_AppendFileToBody) |
633 TEST_PPAPI_NACL(DISABLED_URLRequest_AppendFileToBody) | 564 TEST_PPAPI_NACL(DISABLED_URLRequest_AppendFileToBody) |
634 TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLRequest_Stress) | |
635 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLRequest_Stress) | 565 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLRequest_Stress) |
636 TEST_PPAPI_NACL(URLRequest_Stress) | 566 TEST_PPAPI_NACL(URLRequest_Stress) |
637 | 567 |
638 TEST_PPAPI_IN_PROCESS(PaintAggregator) | |
639 TEST_PPAPI_OUT_OF_PROCESS(PaintAggregator) | 568 TEST_PPAPI_OUT_OF_PROCESS(PaintAggregator) |
640 TEST_PPAPI_NACL(PaintAggregator) | 569 TEST_PPAPI_NACL(PaintAggregator) |
641 | 570 |
642 // TODO(danakj): http://crbug.com/115286 | 571 // TODO(danakj): http://crbug.com/115286 |
643 TEST_PPAPI_NACL(DISABLED_Scrollbar) | 572 TEST_PPAPI_NACL(DISABLED_Scrollbar) |
644 | 573 |
645 TEST_PPAPI_NACL(Var) | 574 TEST_PPAPI_NACL(Var) |
646 | 575 |
647 TEST_PPAPI_NACL(VarResource) | 576 TEST_PPAPI_NACL(VarResource) |
648 | 577 |
(...skipping 24 matching lines...) Expand all Loading... | |
673 #define MAYBE_PostMessage DISABLED_PostMessage | 602 #define MAYBE_PostMessage DISABLED_PostMessage |
674 #else | 603 #else |
675 #define MAYBE_PostMessage PostMessage | 604 #define MAYBE_PostMessage PostMessage |
676 #endif | 605 #endif |
677 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_PostMessage) { | 606 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_PostMessage) { |
678 RUN_POSTMESSAGE_SUBTESTS; | 607 RUN_POSTMESSAGE_SUBTESTS; |
679 } | 608 } |
680 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, PostMessage) { | 609 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, PostMessage) { |
681 RUN_POSTMESSAGE_SUBTESTS; | 610 RUN_POSTMESSAGE_SUBTESTS; |
682 } | 611 } |
683 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(PostMessage)) { | |
684 RUN_POSTMESSAGE_SUBTESTS; | |
685 } | |
686 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, PostMessage) { | 612 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, PostMessage) { |
687 RUN_POSTMESSAGE_SUBTESTS; | 613 RUN_POSTMESSAGE_SUBTESTS; |
688 } | 614 } |
689 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, | 615 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, |
690 MAYBE_PNACL_NONSFI(PostMessage)) { | 616 MAYBE_PNACL_NONSFI(PostMessage)) { |
691 RUN_POSTMESSAGE_SUBTESTS; | 617 RUN_POSTMESSAGE_SUBTESTS; |
692 } | 618 } |
693 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest, | 619 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest, |
694 MAYBE_PNACL_TRANSITIONAL_NONSFI(PostMessage)) { | 620 MAYBE_PNACL_TRANSITIONAL_NONSFI(PostMessage)) { |
695 RUN_POSTMESSAGE_SUBTESTS; | 621 RUN_POSTMESSAGE_SUBTESTS; |
(...skipping 15 matching lines...) Expand all Loading... | |
711 LIST_TEST(FileIO_TouchQuery) \ | 637 LIST_TEST(FileIO_TouchQuery) \ |
712 ) | 638 ) |
713 | 639 |
714 #define RUN_FILEIO_PRIVATE_SUBTESTS \ | 640 #define RUN_FILEIO_PRIVATE_SUBTESTS \ |
715 RunTestViaHTTP( \ | 641 RunTestViaHTTP( \ |
716 LIST_TEST(FileIO_RequestOSFileHandle) \ | 642 LIST_TEST(FileIO_RequestOSFileHandle) \ |
717 LIST_TEST(FileIO_RequestOSFileHandleWithOpenExclusive) \ | 643 LIST_TEST(FileIO_RequestOSFileHandleWithOpenExclusive) \ |
718 LIST_TEST(FileIO_Mmap) \ | 644 LIST_TEST(FileIO_Mmap) \ |
719 ) | 645 ) |
720 | 646 |
721 IN_PROC_BROWSER_TEST_F(PPAPITest, FileIO) { | |
722 RUN_FILEIO_SUBTESTS; | |
723 } | |
724 IN_PROC_BROWSER_TEST_F(PPAPIPrivateTest, FileIO_Private) { | 647 IN_PROC_BROWSER_TEST_F(PPAPIPrivateTest, FileIO_Private) { |
725 RUN_FILEIO_PRIVATE_SUBTESTS; | 648 RUN_FILEIO_PRIVATE_SUBTESTS; |
726 } | 649 } |
727 | 650 |
728 // See: crbug.com/421284 | 651 // See: crbug.com/421284 |
729 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, DISABLED_FileIO) { | 652 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, DISABLED_FileIO) { |
730 RUN_FILEIO_SUBTESTS; | 653 RUN_FILEIO_SUBTESTS; |
731 } | 654 } |
732 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPIPrivateTest, FileIO_Private) { | 655 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPIPrivateTest, FileIO_Private) { |
733 RUN_FILEIO_PRIVATE_SUBTESTS; | 656 RUN_FILEIO_PRIVATE_SUBTESTS; |
734 } | 657 } |
735 | 658 |
736 // http://crbug.com/313401 | 659 // http://crbug.com/313401 |
737 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, DISABLED_FileIO) { | 660 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, DISABLED_FileIO) { |
738 RUN_FILEIO_SUBTESTS; | 661 RUN_FILEIO_SUBTESTS; |
739 } | 662 } |
740 // http://crbug.com/313401 | 663 // http://crbug.com/313401 |
741 IN_PROC_BROWSER_TEST_F(PPAPIPrivateNaClNewlibTest, | 664 IN_PROC_BROWSER_TEST_F(PPAPIPrivateNaClNewlibTest, |
742 DISABLED_NaCl_Newlib_FileIO_Private) { | 665 DISABLED_NaCl_Newlib_FileIO_Private) { |
743 RUN_FILEIO_PRIVATE_SUBTESTS; | 666 RUN_FILEIO_PRIVATE_SUBTESTS; |
744 } | 667 } |
745 | 668 |
746 // Flaky on 32-bit linux bot; http://crbug.com/308905 | |
747 // Flaky on Windows too; http://crbug.com/321300 | |
748 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, DISABLED_FileIO) { | |
749 RUN_FILEIO_SUBTESTS; | |
750 } | |
751 IN_PROC_BROWSER_TEST_F(PPAPIPrivateNaClGLibcTest, DISABLED_FileIO_Private) { | |
752 RUN_FILEIO_PRIVATE_SUBTESTS; | |
753 } | |
754 | |
755 // http://crbug.com/313205 | 669 // http://crbug.com/313205 |
756 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, DISABLED_FileIO) { | 670 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, DISABLED_FileIO) { |
757 RUN_FILEIO_SUBTESTS; | 671 RUN_FILEIO_SUBTESTS; |
758 } | 672 } |
759 IN_PROC_BROWSER_TEST_F(PPAPIPrivateNaClPNaClTest, | 673 IN_PROC_BROWSER_TEST_F(PPAPIPrivateNaClPNaClTest, |
760 DISABLED_PNaCl_FileIO_Private) { | 674 DISABLED_PNaCl_FileIO_Private) { |
761 RUN_FILEIO_PRIVATE_SUBTESTS; | 675 RUN_FILEIO_PRIVATE_SUBTESTS; |
762 } | 676 } |
763 | 677 |
764 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, MAYBE_PNACL_NONSFI(FileIO)) { | 678 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, MAYBE_PNACL_NONSFI(FileIO)) { |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
803 RunTestViaHTTP( \ | 717 RunTestViaHTTP( \ |
804 LIST_TEST(FileRef_QueryAndTouchFile) \ | 718 LIST_TEST(FileRef_QueryAndTouchFile) \ |
805 LIST_TEST(FileRef_DeleteFileAndDirectory) \ | 719 LIST_TEST(FileRef_DeleteFileAndDirectory) \ |
806 LIST_TEST(FileRef_RenameFileAndDirectory) \ | 720 LIST_TEST(FileRef_RenameFileAndDirectory) \ |
807 LIST_TEST(FileRef_Query) \ | 721 LIST_TEST(FileRef_Query) \ |
808 LIST_TEST(FileRef_FileNameEscaping) \ | 722 LIST_TEST(FileRef_FileNameEscaping) \ |
809 ) | 723 ) |
810 | 724 |
811 // Note, the FileRef tests are split into two, because all of them together | 725 // Note, the FileRef tests are split into two, because all of them together |
812 // sometimes take too long on windows: crbug.com/336999 | 726 // sometimes take too long on windows: crbug.com/336999 |
813 IN_PROC_BROWSER_TEST_F(PPAPITest, FileRef1) { | |
814 RUN_FILEREF_SUBTESTS_1; | |
815 } | |
816 IN_PROC_BROWSER_TEST_F(PPAPITest, FileRef2) { | |
817 RUN_FILEREF_SUBTESTS_2; | |
818 } | |
819 // This test only works as an in-process test. See crbug.com/241646. | 727 // This test only works as an in-process test. See crbug.com/241646. |
820 IN_PROC_BROWSER_TEST_F(PPAPITest, FileRef_ReadDirectoryEntries) { | |
821 RunTestViaHTTP(LIST_TEST(FileRef_ReadDirectoryEntries)); | |
822 } | |
823 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, FileRef1) { | 728 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, FileRef1) { |
824 RUN_FILEREF_SUBTESTS_1; | 729 RUN_FILEREF_SUBTESTS_1; |
825 } | 730 } |
826 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, FileRef2) { | 731 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, FileRef2) { |
827 RUN_FILEREF_SUBTESTS_2; | 732 RUN_FILEREF_SUBTESTS_2; |
828 } | 733 } |
829 | 734 |
830 #if defined(OS_MACOSX) && defined(ADDRESS_SANITIZER) | 735 #if defined(OS_MACOSX) && defined(ADDRESS_SANITIZER) |
831 // Flaky on Mac ASAN: http://crbug.com/437411. | 736 // Flaky on Mac ASAN: http://crbug.com/437411. |
832 #define MAYBE_FileRef1 DISABLED_FileRef1 | 737 #define MAYBE_FileRef1 DISABLED_FileRef1 |
833 #else | 738 #else |
834 #define MAYBE_FileRef1 FileRef1 | 739 #define MAYBE_FileRef1 FileRef1 |
835 #endif | 740 #endif |
836 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, MAYBE_FileRef1) { | 741 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, MAYBE_FileRef1) { |
837 RUN_FILEREF_SUBTESTS_1; | 742 RUN_FILEREF_SUBTESTS_1; |
838 } | 743 } |
839 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, FileRef2) { | 744 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, FileRef2) { |
840 RUN_FILEREF_SUBTESTS_2; | 745 RUN_FILEREF_SUBTESTS_2; |
841 } | 746 } |
842 // Flaky on 32-bit linux bot; http://crbug.com/308908 | |
843 // Glibc not available on ARM | |
844 #if (defined(OS_LINUX) && defined(ARCH_CPU_X86)) \ | |
845 || defined(ARCH_CPU_ARM_FAMILY) | |
846 #define MAYBE_NaCl_Glibc_FileRef1 DISABLED_FileRef1 | |
847 #define MAYBE_NaCl_Glibc_FileRef2 DISABLED_FileRef2 | |
848 #else | |
849 #define MAYBE_NaCl_Glibc_FileRef1 FileRef1 | |
850 #define MAYBE_NaCl_Glibc_FileRef2 FileRef2 | |
851 #endif | |
852 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_NaCl_Glibc_FileRef1) { | |
853 RUN_FILEREF_SUBTESTS_1; | |
854 } | |
855 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_NaCl_Glibc_FileRef2) { | |
856 RUN_FILEREF_SUBTESTS_2; | |
857 } | |
858 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, FileRef1) { | 747 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, FileRef1) { |
859 RUN_FILEREF_SUBTESTS_1; | 748 RUN_FILEREF_SUBTESTS_1; |
860 } | 749 } |
861 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, FileRef2) { | 750 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, FileRef2) { |
862 RUN_FILEREF_SUBTESTS_2; | 751 RUN_FILEREF_SUBTESTS_2; |
863 } | 752 } |
864 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, | 753 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, |
865 MAYBE_PNACL_NONSFI(FileRef1)) { | 754 MAYBE_PNACL_NONSFI(FileRef1)) { |
866 RUN_FILEREF_SUBTESTS_1; | 755 RUN_FILEREF_SUBTESTS_1; |
867 } | 756 } |
868 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, | 757 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, |
869 MAYBE_PNACL_NONSFI(FileRef2)) { | 758 MAYBE_PNACL_NONSFI(FileRef2)) { |
870 RUN_FILEREF_SUBTESTS_2; | 759 RUN_FILEREF_SUBTESTS_2; |
871 } | 760 } |
872 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest, | 761 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest, |
873 MAYBE_PNACL_TRANSITIONAL_NONSFI(FileRef1)) { | 762 MAYBE_PNACL_TRANSITIONAL_NONSFI(FileRef1)) { |
874 RUN_FILEREF_SUBTESTS_1; | 763 RUN_FILEREF_SUBTESTS_1; |
875 } | 764 } |
876 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest, | 765 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest, |
877 MAYBE_PNACL_TRANSITIONAL_NONSFI(FileRef2)) { | 766 MAYBE_PNACL_TRANSITIONAL_NONSFI(FileRef2)) { |
878 RUN_FILEREF_SUBTESTS_2; | 767 RUN_FILEREF_SUBTESTS_2; |
879 } | 768 } |
880 | 769 |
881 TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileSystem) | |
882 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileSystem) | 770 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileSystem) |
883 | 771 |
884 // PPAPINaClTest.FileSystem times out consistently on Windows and Mac. | 772 // PPAPINaClTest.FileSystem times out consistently on Windows and Mac. |
885 // http://crbug.com/130372 | 773 // http://crbug.com/130372 |
886 #if defined(OS_MACOSX) || defined(OS_WIN) | 774 #if defined(OS_MACOSX) || defined(OS_WIN) |
887 #define MAYBE_FileSystem DISABLED_FileSystem | 775 #define MAYBE_FileSystem DISABLED_FileSystem |
888 #else | 776 #else |
889 #define MAYBE_FileSystem FileSystem | 777 #define MAYBE_FileSystem FileSystem |
890 #endif | 778 #endif |
891 | 779 |
892 TEST_PPAPI_NACL(MAYBE_FileSystem) | 780 TEST_PPAPI_NACL(MAYBE_FileSystem) |
893 | 781 |
894 #if defined(OS_MACOSX) | 782 #if defined(OS_MACOSX) |
895 // http://crbug.com/103912 | 783 // http://crbug.com/103912 |
896 #define MAYBE_Fullscreen DISABLED_Fullscreen | 784 #define MAYBE_Fullscreen DISABLED_Fullscreen |
897 #elif defined(OS_LINUX) | 785 #elif defined(OS_LINUX) |
898 // http://crbug.com/146008 | 786 // http://crbug.com/146008 |
899 #define MAYBE_Fullscreen DISABLED_Fullscreen | 787 #define MAYBE_Fullscreen DISABLED_Fullscreen |
900 #elif defined(OS_WIN) | 788 #elif defined(OS_WIN) |
901 // http://crbug.com/342269 | 789 // http://crbug.com/342269 |
902 #define MAYBE_Fullscreen DISABLED_Fullscreen | 790 #define MAYBE_Fullscreen DISABLED_Fullscreen |
903 #else | 791 #else |
904 #define MAYBE_Fullscreen Fullscreen | 792 #define MAYBE_Fullscreen Fullscreen |
905 #endif | 793 #endif |
906 | 794 |
907 TEST_PPAPI_IN_PROCESS_VIA_HTTP(MAYBE_Fullscreen) | |
908 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(MAYBE_Fullscreen) | 795 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(MAYBE_Fullscreen) |
909 TEST_PPAPI_NACL(MAYBE_Fullscreen) | 796 TEST_PPAPI_NACL(MAYBE_Fullscreen) |
910 | 797 |
911 TEST_PPAPI_OUT_OF_PROCESS(X509CertificatePrivate) | 798 TEST_PPAPI_OUT_OF_PROCESS(X509CertificatePrivate) |
912 | 799 |
913 TEST_PPAPI_IN_PROCESS(UMA) | |
914 TEST_PPAPI_OUT_OF_PROCESS(UMA) | 800 TEST_PPAPI_OUT_OF_PROCESS(UMA) |
915 TEST_PPAPI_NACL(UMA) | 801 TEST_PPAPI_NACL(UMA) |
916 | 802 |
917 // NetAddress tests. | 803 // NetAddress tests. |
918 #define RUN_NETADDRESS_SUBTESTS \ | 804 #define RUN_NETADDRESS_SUBTESTS \ |
919 RunTestViaHTTP( \ | 805 RunTestViaHTTP( \ |
920 LIST_TEST(NetAddress_IPv4Address) \ | 806 LIST_TEST(NetAddress_IPv4Address) \ |
921 LIST_TEST(NetAddress_IPv6Address) \ | 807 LIST_TEST(NetAddress_IPv6Address) \ |
922 LIST_TEST(NetAddress_DescribeAsString) \ | 808 LIST_TEST(NetAddress_DescribeAsString) \ |
923 ) | 809 ) |
924 | 810 |
925 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, NetAddress) { | 811 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, NetAddress) { |
926 RUN_NETADDRESS_SUBTESTS; | 812 RUN_NETADDRESS_SUBTESTS; |
927 } | 813 } |
928 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, NetAddress) { | 814 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, NetAddress) { |
929 RUN_NETADDRESS_SUBTESTS; | 815 RUN_NETADDRESS_SUBTESTS; |
930 } | 816 } |
931 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(NetAddress)) { | |
932 RUN_NETADDRESS_SUBTESTS; | |
933 } | |
934 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, NetAddress) { | 817 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, NetAddress) { |
935 RUN_NETADDRESS_SUBTESTS; | 818 RUN_NETADDRESS_SUBTESTS; |
936 } | 819 } |
937 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, | 820 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, |
938 MAYBE_PNACL_NONSFI(NetAddress)) { | 821 MAYBE_PNACL_NONSFI(NetAddress)) { |
939 RUN_NETADDRESS_SUBTESTS; | 822 RUN_NETADDRESS_SUBTESTS; |
940 } | 823 } |
941 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest, | 824 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest, |
942 MAYBE_PNACL_TRANSITIONAL_NONSFI(NetAddress)) { | 825 MAYBE_PNACL_TRANSITIONAL_NONSFI(NetAddress)) { |
943 RUN_NETADDRESS_SUBTESTS; | 826 RUN_NETADDRESS_SUBTESTS; |
944 } | 827 } |
945 | 828 |
946 // NetAddressPrivate tests. | 829 // NetAddressPrivate tests. |
947 #define RUN_NETADDRESS_PRIVATE_SUBTESTS \ | 830 #define RUN_NETADDRESS_PRIVATE_SUBTESTS \ |
948 RunTestViaHTTP( \ | 831 RunTestViaHTTP( \ |
949 LIST_TEST(NetAddressPrivate_AreEqual) \ | 832 LIST_TEST(NetAddressPrivate_AreEqual) \ |
950 LIST_TEST(NetAddressPrivate_AreHostsEqual) \ | 833 LIST_TEST(NetAddressPrivate_AreHostsEqual) \ |
951 LIST_TEST(NetAddressPrivate_Describe) \ | 834 LIST_TEST(NetAddressPrivate_Describe) \ |
952 LIST_TEST(NetAddressPrivate_ReplacePort) \ | 835 LIST_TEST(NetAddressPrivate_ReplacePort) \ |
953 LIST_TEST(NetAddressPrivate_GetAnyAddress) \ | 836 LIST_TEST(NetAddressPrivate_GetAnyAddress) \ |
954 LIST_TEST(NetAddressPrivate_DescribeIPv6) \ | 837 LIST_TEST(NetAddressPrivate_DescribeIPv6) \ |
955 LIST_TEST(NetAddressPrivate_GetFamily) \ | 838 LIST_TEST(NetAddressPrivate_GetFamily) \ |
956 LIST_TEST(NetAddressPrivate_GetPort) \ | 839 LIST_TEST(NetAddressPrivate_GetPort) \ |
957 LIST_TEST(NetAddressPrivate_GetAddress) \ | 840 LIST_TEST(NetAddressPrivate_GetAddress) \ |
958 LIST_TEST(NetAddressPrivate_GetScopeID) \ | 841 LIST_TEST(NetAddressPrivate_GetScopeID) \ |
959 ) | 842 ) |
960 | 843 |
961 IN_PROC_BROWSER_TEST_F(PPAPITest, NetAddressPrivate) { | |
962 RUN_NETADDRESS_PRIVATE_SUBTESTS; | |
963 } | |
964 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, NetAddressPrivate) { | 844 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, NetAddressPrivate) { |
965 RUN_NETADDRESS_PRIVATE_SUBTESTS; | 845 RUN_NETADDRESS_PRIVATE_SUBTESTS; |
966 } | 846 } |
967 | 847 |
968 #define RUN_NETADDRESS_PRIVATE_UNTRUSTED_SUBTESTS \ | 848 #define RUN_NETADDRESS_PRIVATE_UNTRUSTED_SUBTESTS \ |
969 RunTestViaHTTP( \ | 849 RunTestViaHTTP( \ |
970 LIST_TEST(NetAddressPrivateUntrusted_AreEqual) \ | 850 LIST_TEST(NetAddressPrivateUntrusted_AreEqual) \ |
971 LIST_TEST(NetAddressPrivateUntrusted_AreHostsEqual) \ | 851 LIST_TEST(NetAddressPrivateUntrusted_AreHostsEqual) \ |
972 LIST_TEST(NetAddressPrivateUntrusted_Describe) \ | 852 LIST_TEST(NetAddressPrivateUntrusted_Describe) \ |
973 LIST_TEST(NetAddressPrivateUntrusted_ReplacePort) \ | 853 LIST_TEST(NetAddressPrivateUntrusted_ReplacePort) \ |
974 LIST_TEST(NetAddressPrivateUntrusted_GetAnyAddress) \ | 854 LIST_TEST(NetAddressPrivateUntrusted_GetAnyAddress) \ |
975 LIST_TEST(NetAddressPrivateUntrusted_GetFamily) \ | 855 LIST_TEST(NetAddressPrivateUntrusted_GetFamily) \ |
976 LIST_TEST(NetAddressPrivateUntrusted_GetPort) \ | 856 LIST_TEST(NetAddressPrivateUntrusted_GetPort) \ |
977 LIST_TEST(NetAddressPrivateUntrusted_GetAddress) \ | 857 LIST_TEST(NetAddressPrivateUntrusted_GetAddress) \ |
978 ) | 858 ) |
979 | 859 |
980 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, NetAddressPrivate) { | 860 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, NetAddressPrivate) { |
981 RUN_NETADDRESS_PRIVATE_UNTRUSTED_SUBTESTS; | 861 RUN_NETADDRESS_PRIVATE_UNTRUSTED_SUBTESTS; |
982 } | 862 } |
983 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(NetAddressPrivate)) { | |
984 RUN_NETADDRESS_PRIVATE_UNTRUSTED_SUBTESTS; | |
985 } | |
986 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, NetAddressPrivate) { | 863 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, NetAddressPrivate) { |
987 RUN_NETADDRESS_PRIVATE_UNTRUSTED_SUBTESTS; | 864 RUN_NETADDRESS_PRIVATE_UNTRUSTED_SUBTESTS; |
988 } | 865 } |
989 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, | 866 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, |
990 MAYBE_PNACL_NONSFI(NetAddressPrivate)) { | 867 MAYBE_PNACL_NONSFI(NetAddressPrivate)) { |
991 RUN_NETADDRESS_PRIVATE_UNTRUSTED_SUBTESTS; | 868 RUN_NETADDRESS_PRIVATE_UNTRUSTED_SUBTESTS; |
992 } | 869 } |
993 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest, | 870 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest, |
994 MAYBE_PNACL_TRANSITIONAL_NONSFI(NetAddressPrivate)) { | 871 MAYBE_PNACL_TRANSITIONAL_NONSFI(NetAddressPrivate)) { |
995 RUN_NETADDRESS_PRIVATE_UNTRUSTED_SUBTESTS; | 872 RUN_NETADDRESS_PRIVATE_UNTRUSTED_SUBTESTS; |
996 } | 873 } |
997 | 874 |
998 // NetworkMonitor tests. | 875 // NetworkMonitor tests. |
999 #define RUN_NETWORK_MONITOR_SUBTESTS \ | 876 #define RUN_NETWORK_MONITOR_SUBTESTS \ |
1000 RunTestViaHTTP( \ | 877 RunTestViaHTTP( \ |
1001 LIST_TEST(NetworkMonitor_Basic) \ | 878 LIST_TEST(NetworkMonitor_Basic) \ |
1002 LIST_TEST(NetworkMonitor_2Monitors) \ | 879 LIST_TEST(NetworkMonitor_2Monitors) \ |
1003 LIST_TEST(NetworkMonitor_DeleteInCallback) \ | 880 LIST_TEST(NetworkMonitor_DeleteInCallback) \ |
1004 ) | 881 ) |
1005 | 882 |
1006 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, NetworkMonitor) { | 883 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, NetworkMonitor) { |
1007 RUN_NETWORK_MONITOR_SUBTESTS; | 884 RUN_NETWORK_MONITOR_SUBTESTS; |
1008 } | 885 } |
1009 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, NetworkMonitor) { | 886 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, NetworkMonitor) { |
1010 RUN_NETWORK_MONITOR_SUBTESTS; | 887 RUN_NETWORK_MONITOR_SUBTESTS; |
1011 } | 888 } |
1012 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(NetworkMonitor)) { | |
1013 RUN_NETWORK_MONITOR_SUBTESTS; | |
1014 } | |
1015 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, NetworkMonitor) { | 889 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, NetworkMonitor) { |
1016 RUN_NETWORK_MONITOR_SUBTESTS; | 890 RUN_NETWORK_MONITOR_SUBTESTS; |
1017 } | 891 } |
1018 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, | 892 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, |
1019 MAYBE_PNACL_NONSFI(NetworkMonitor)) { | 893 MAYBE_PNACL_NONSFI(NetworkMonitor)) { |
1020 RUN_NETWORK_MONITOR_SUBTESTS; | 894 RUN_NETWORK_MONITOR_SUBTESTS; |
1021 } | 895 } |
1022 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest, | 896 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest, |
1023 MAYBE_PNACL_TRANSITIONAL_NONSFI(NetworkMonitor)) { | 897 MAYBE_PNACL_TRANSITIONAL_NONSFI(NetworkMonitor)) { |
1024 RUN_NETWORK_MONITOR_SUBTESTS; | 898 RUN_NETWORK_MONITOR_SUBTESTS; |
1025 } | 899 } |
1026 | 900 |
1027 // Flash tests. | 901 // Flash tests. |
1028 #define RUN_FLASH_SUBTESTS \ | 902 #define RUN_FLASH_SUBTESTS \ |
1029 RunTestViaHTTP( \ | 903 RunTestViaHTTP( \ |
1030 LIST_TEST(Flash_SetInstanceAlwaysOnTop) \ | 904 LIST_TEST(Flash_SetInstanceAlwaysOnTop) \ |
1031 LIST_TEST(Flash_GetCommandLineArgs) \ | 905 LIST_TEST(Flash_GetCommandLineArgs) \ |
1032 ) | 906 ) |
1033 | 907 |
1034 IN_PROC_BROWSER_TEST_F(PPAPITest, Flash) { | |
1035 RUN_FLASH_SUBTESTS; | |
1036 } | |
1037 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, Flash) { | 908 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, Flash) { |
1038 RUN_FLASH_SUBTESTS; | 909 RUN_FLASH_SUBTESTS; |
1039 } | 910 } |
1040 | 911 |
1041 // In-process WebSocket tests. Note, the WebSocket tests are split into two, | 912 // In-process WebSocket tests. Note, the WebSocket tests are split into two, |
1042 // because all of them together sometimes take too long on windows: | 913 // because all of them together sometimes take too long on windows: |
1043 // crbug.com/336999 | 914 // crbug.com/336999 |
1044 #define RUN_WEBSOCKET_SUBTESTS_1 \ | 915 #define RUN_WEBSOCKET_SUBTESTS_1 \ |
1045 RunTestWithWebSocketServer( \ | 916 RunTestWithWebSocketServer( \ |
1046 LIST_TEST(WebSocket_IsWebSocket) \ | 917 LIST_TEST(WebSocket_IsWebSocket) \ |
(...skipping 24 matching lines...) Expand all Loading... | |
1071 LIST_TEST(WebSocket_UtilityGetURL) \ | 942 LIST_TEST(WebSocket_UtilityGetURL) \ |
1072 LIST_TEST(WebSocket_UtilityValidConnect) \ | 943 LIST_TEST(WebSocket_UtilityValidConnect) \ |
1073 LIST_TEST(WebSocket_UtilityInvalidClose) \ | 944 LIST_TEST(WebSocket_UtilityInvalidClose) \ |
1074 LIST_TEST(WebSocket_UtilityValidClose) \ | 945 LIST_TEST(WebSocket_UtilityValidClose) \ |
1075 LIST_TEST(WebSocket_UtilityGetProtocol) \ | 946 LIST_TEST(WebSocket_UtilityGetProtocol) \ |
1076 LIST_TEST(WebSocket_UtilityTextSendReceive) \ | 947 LIST_TEST(WebSocket_UtilityTextSendReceive) \ |
1077 LIST_TEST(WebSocket_UtilityBinarySendReceive) \ | 948 LIST_TEST(WebSocket_UtilityBinarySendReceive) \ |
1078 LIST_TEST(WebSocket_UtilityBufferedAmount) \ | 949 LIST_TEST(WebSocket_UtilityBufferedAmount) \ |
1079 ) | 950 ) |
1080 | 951 |
1081 IN_PROC_BROWSER_TEST_F(PPAPITest, WebSocket1) { | |
1082 RUN_WEBSOCKET_SUBTESTS_1; | |
1083 } | |
1084 IN_PROC_BROWSER_TEST_F(PPAPITest, WebSocket2) { | |
1085 RUN_WEBSOCKET_SUBTESTS_2; | |
1086 } | |
1087 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, WebSocket1) { | 952 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, WebSocket1) { |
1088 RUN_WEBSOCKET_SUBTESTS_1; | 953 RUN_WEBSOCKET_SUBTESTS_1; |
1089 } | 954 } |
1090 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, WebSocket2) { | 955 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, WebSocket2) { |
1091 RUN_WEBSOCKET_SUBTESTS_2; | 956 RUN_WEBSOCKET_SUBTESTS_2; |
1092 } | 957 } |
1093 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(WebSocket1)) { | |
1094 RUN_WEBSOCKET_SUBTESTS_1; | |
1095 } | |
1096 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(WebSocket2)) { | |
1097 RUN_WEBSOCKET_SUBTESTS_2; | |
1098 } | |
1099 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, WebSocket1) { | 958 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, WebSocket1) { |
1100 RUN_WEBSOCKET_SUBTESTS_1; | 959 RUN_WEBSOCKET_SUBTESTS_1; |
1101 } | 960 } |
1102 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, WebSocket2) { | 961 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, WebSocket2) { |
1103 RUN_WEBSOCKET_SUBTESTS_2; | 962 RUN_WEBSOCKET_SUBTESTS_2; |
1104 } | 963 } |
1105 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, WebSocket1) { | 964 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, WebSocket1) { |
1106 RUN_WEBSOCKET_SUBTESTS_1; | 965 RUN_WEBSOCKET_SUBTESTS_1; |
1107 } | 966 } |
1108 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, WebSocket2) { | 967 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, WebSocket2) { |
(...skipping 17 matching lines...) Expand all Loading... | |
1126 } | 985 } |
1127 | 986 |
1128 // AudioConfig tests | 987 // AudioConfig tests |
1129 #define RUN_AUDIO_CONFIG_SUBTESTS \ | 988 #define RUN_AUDIO_CONFIG_SUBTESTS \ |
1130 RunTestViaHTTP( \ | 989 RunTestViaHTTP( \ |
1131 LIST_TEST(AudioConfig_RecommendSampleRate) \ | 990 LIST_TEST(AudioConfig_RecommendSampleRate) \ |
1132 LIST_TEST(AudioConfig_ValidConfigs) \ | 991 LIST_TEST(AudioConfig_ValidConfigs) \ |
1133 LIST_TEST(AudioConfig_InvalidConfigs) \ | 992 LIST_TEST(AudioConfig_InvalidConfigs) \ |
1134 ) | 993 ) |
1135 | 994 |
1136 IN_PROC_BROWSER_TEST_F(PPAPITest, AudioConfig) { | |
1137 RUN_AUDIO_CONFIG_SUBTESTS; | |
1138 } | |
1139 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, AudioConfig) { | 995 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, AudioConfig) { |
1140 RUN_AUDIO_CONFIG_SUBTESTS; | 996 RUN_AUDIO_CONFIG_SUBTESTS; |
1141 } | 997 } |
1142 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, AudioConfig) { | 998 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, AudioConfig) { |
1143 RUN_AUDIO_CONFIG_SUBTESTS; | 999 RUN_AUDIO_CONFIG_SUBTESTS; |
1144 } | 1000 } |
1145 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(AudioConfig)) { | |
1146 RUN_AUDIO_CONFIG_SUBTESTS; | |
1147 } | |
1148 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, AudioConfig) { | 1001 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, AudioConfig) { |
1149 RUN_AUDIO_CONFIG_SUBTESTS; | 1002 RUN_AUDIO_CONFIG_SUBTESTS; |
1150 } | 1003 } |
1151 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, | 1004 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, |
1152 MAYBE_PNACL_NONSFI(AudioConfig)) { | 1005 MAYBE_PNACL_NONSFI(AudioConfig)) { |
1153 RUN_AUDIO_CONFIG_SUBTESTS; | 1006 RUN_AUDIO_CONFIG_SUBTESTS; |
1154 } | 1007 } |
1155 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest, | 1008 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest, |
1156 MAYBE_PNACL_TRANSITIONAL_NONSFI(AudioConfig)) { | 1009 MAYBE_PNACL_TRANSITIONAL_NONSFI(AudioConfig)) { |
1157 RUN_AUDIO_CONFIG_SUBTESTS; | 1010 RUN_AUDIO_CONFIG_SUBTESTS; |
(...skipping 17 matching lines...) Expand all Loading... | |
1175 #else | 1028 #else |
1176 #define MAYBE_Audio Audio | 1029 #define MAYBE_Audio Audio |
1177 #endif | 1030 #endif |
1178 // PPB_Audio is not supported in-process. | 1031 // PPB_Audio is not supported in-process. |
1179 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_Audio) { | 1032 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_Audio) { |
1180 RUN_AUDIO_SUBTESTS; | 1033 RUN_AUDIO_SUBTESTS; |
1181 } | 1034 } |
1182 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, Audio) { | 1035 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, Audio) { |
1183 RUN_AUDIO_SUBTESTS; | 1036 RUN_AUDIO_SUBTESTS; |
1184 } | 1037 } |
1185 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(Audio)) { | |
1186 RUN_AUDIO_SUBTESTS; | |
1187 } | |
1188 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, Audio) { | 1038 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, Audio) { |
1189 RUN_AUDIO_SUBTESTS; | 1039 RUN_AUDIO_SUBTESTS; |
1190 } | 1040 } |
1191 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, | 1041 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, |
1192 MAYBE_PNACL_NONSFI(Audio)) { | 1042 MAYBE_PNACL_NONSFI(Audio)) { |
1193 RUN_AUDIO_SUBTESTS; | 1043 RUN_AUDIO_SUBTESTS; |
1194 } | 1044 } |
1195 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest, | 1045 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest, |
1196 MAYBE_PNACL_TRANSITIONAL_NONSFI(Audio)) { | 1046 MAYBE_PNACL_TRANSITIONAL_NONSFI(Audio)) { |
1197 RUN_AUDIO_SUBTESTS; | 1047 RUN_AUDIO_SUBTESTS; |
1198 } | 1048 } |
1199 | 1049 |
1200 #define RUN_AUDIO_THREAD_CREATOR_SUBTESTS \ | 1050 #define RUN_AUDIO_THREAD_CREATOR_SUBTESTS \ |
1201 RunTestViaHTTP( \ | 1051 RunTestViaHTTP( \ |
1202 LIST_TEST(Audio_AudioThreadCreatorIsRequired) \ | 1052 LIST_TEST(Audio_AudioThreadCreatorIsRequired) \ |
1203 LIST_TEST(Audio_AudioThreadCreatorIsCalled) \ | 1053 LIST_TEST(Audio_AudioThreadCreatorIsCalled) \ |
1204 ) | 1054 ) |
1205 | 1055 |
1206 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, AudioThreadCreator) { | 1056 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, AudioThreadCreator) { |
1207 RUN_AUDIO_THREAD_CREATOR_SUBTESTS; | 1057 RUN_AUDIO_THREAD_CREATOR_SUBTESTS; |
1208 } | 1058 } |
1209 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(AudioThreadCreator)) { | |
1210 RUN_AUDIO_THREAD_CREATOR_SUBTESTS; | |
1211 } | |
1212 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, AudioThreadCreator) { | 1059 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, AudioThreadCreator) { |
1213 RUN_AUDIO_THREAD_CREATOR_SUBTESTS; | 1060 RUN_AUDIO_THREAD_CREATOR_SUBTESTS; |
1214 } | 1061 } |
1215 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, | 1062 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, |
1216 MAYBE_PNACL_NONSFI(AudioThreadCreator)) { | 1063 MAYBE_PNACL_NONSFI(AudioThreadCreator)) { |
1217 RUN_AUDIO_THREAD_CREATOR_SUBTESTS; | 1064 RUN_AUDIO_THREAD_CREATOR_SUBTESTS; |
1218 } | 1065 } |
1219 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest, | 1066 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest, |
1220 MAYBE_PNACL_TRANSITIONAL_NONSFI(AudioThreadCreator)) { | 1067 MAYBE_PNACL_TRANSITIONAL_NONSFI(AudioThreadCreator)) { |
1221 RUN_AUDIO_THREAD_CREATOR_SUBTESTS; | 1068 RUN_AUDIO_THREAD_CREATOR_SUBTESTS; |
1222 } | 1069 } |
1223 | 1070 |
1224 TEST_PPAPI_IN_PROCESS(View_CreatedVisible); | |
1225 TEST_PPAPI_OUT_OF_PROCESS(View_CreatedVisible); | 1071 TEST_PPAPI_OUT_OF_PROCESS(View_CreatedVisible); |
1226 TEST_PPAPI_NACL(View_CreatedVisible); | 1072 TEST_PPAPI_NACL(View_CreatedVisible); |
1227 // This test ensures that plugins created in a background tab have their | 1073 // This test ensures that plugins created in a background tab have their |
1228 // initial visibility set to false. We don't bother testing in-process for this | 1074 // initial visibility set to false. We don't bother testing in-process for this |
1229 // custom test since the out of process code also exercises in-process. | 1075 // custom test since the out of process code also exercises in-process. |
1230 | 1076 |
1231 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, View_CreateInvisible) { | 1077 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, View_CreateInvisible) { |
1232 // Make a second tab in the foreground. | 1078 // Make a second tab in the foreground. |
1233 GURL url = GetTestFileUrl("View_CreatedInvisible"); | 1079 GURL url = GetTestFileUrl("View_CreatedInvisible"); |
1234 chrome::NavigateParams params(browser(), url, ui::PAGE_TRANSITION_LINK); | 1080 chrome::NavigateParams params(browser(), url, ui::PAGE_TRANSITION_LINK); |
(...skipping 28 matching lines...) Expand all Loading... | |
1263 EXPECT_STREQ("TestPageHideShow:Hidden", handler.message().c_str()); | 1109 EXPECT_STREQ("TestPageHideShow:Hidden", handler.message().c_str()); |
1264 observer.Reset(); | 1110 observer.Reset(); |
1265 | 1111 |
1266 // Switch back to the test tab. | 1112 // Switch back to the test tab. |
1267 browser()->tab_strip_model()->ActivateTabAt(0, true); | 1113 browser()->tab_strip_model()->ActivateTabAt(0, true); |
1268 | 1114 |
1269 ASSERT_TRUE(observer.Run()) << handler.error_message(); | 1115 ASSERT_TRUE(observer.Run()) << handler.error_message(); |
1270 EXPECT_STREQ("PASS", handler.message().c_str()); | 1116 EXPECT_STREQ("PASS", handler.message().c_str()); |
1271 } | 1117 } |
1272 | 1118 |
1273 // Tests that if a plugin accepts touch events, the browser knows to send touch | |
1274 // events to the renderer. | |
1275 IN_PROC_BROWSER_TEST_F(PPAPITest, InputEvent_AcceptTouchEvent) { | |
1276 std::string positive_tests[] = { "InputEvent_AcceptTouchEvent_1", | |
1277 "InputEvent_AcceptTouchEvent_2", | |
1278 "InputEvent_AcceptTouchEvent_3", | |
1279 "InputEvent_AcceptTouchEvent_4" | |
1280 }; | |
1281 | |
1282 for (size_t i = 0; i < arraysize(positive_tests); ++i) { | |
1283 RenderViewHost* host = browser()->tab_strip_model()-> | |
1284 GetActiveWebContents()->GetRenderViewHost(); | |
1285 RunTest(positive_tests[i]); | |
1286 EXPECT_TRUE(content::RenderViewHostTester::HasTouchEventHandler(host)); | |
1287 } | |
1288 } | |
1289 | |
1290 // View tests. | 1119 // View tests. |
1291 #define RUN_VIEW_SUBTESTS \ | 1120 #define RUN_VIEW_SUBTESTS \ |
1292 RunTestViaHTTP( \ | 1121 RunTestViaHTTP( \ |
1293 LIST_TEST(View_SizeChange) \ | 1122 LIST_TEST(View_SizeChange) \ |
1294 LIST_TEST(View_ClipChange) \ | 1123 LIST_TEST(View_ClipChange) \ |
1295 LIST_TEST(View_ScrollOffsetChange) \ | 1124 LIST_TEST(View_ScrollOffsetChange) \ |
1296 ) | 1125 ) |
1297 | 1126 |
1298 IN_PROC_BROWSER_TEST_F(PPAPITest, View) { | |
1299 RUN_VIEW_SUBTESTS; | |
1300 } | |
1301 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, View) { | 1127 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, View) { |
1302 RUN_VIEW_SUBTESTS; | 1128 RUN_VIEW_SUBTESTS; |
1303 } | 1129 } |
1304 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, View) { | 1130 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, View) { |
1305 RUN_VIEW_SUBTESTS; | 1131 RUN_VIEW_SUBTESTS; |
1306 } | 1132 } |
1307 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(View)) { | |
1308 RUN_VIEW_SUBTESTS; | |
1309 } | |
1310 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, View) { | 1133 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, View) { |
1311 RUN_VIEW_SUBTESTS; | 1134 RUN_VIEW_SUBTESTS; |
1312 } | 1135 } |
1313 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, MAYBE_PNACL_NONSFI(View)) { | 1136 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, MAYBE_PNACL_NONSFI(View)) { |
1314 RUN_VIEW_SUBTESTS; | 1137 RUN_VIEW_SUBTESTS; |
1315 } | 1138 } |
1316 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest, | 1139 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTransitionalNonSfiTest, |
1317 MAYBE_PNACL_TRANSITIONAL_NONSFI(View)) { | 1140 MAYBE_PNACL_TRANSITIONAL_NONSFI(View)) { |
1318 RUN_VIEW_SUBTESTS; | 1141 RUN_VIEW_SUBTESTS; |
1319 } | 1142 } |
1320 | 1143 |
1321 // FlashMessageLoop tests. | 1144 // FlashMessageLoop tests. |
1322 #define RUN_FLASH_MESSAGE_LOOP_SUBTESTS \ | 1145 #define RUN_FLASH_MESSAGE_LOOP_SUBTESTS \ |
1323 RunTest( \ | 1146 RunTest( \ |
1324 LIST_TEST(FlashMessageLoop_Basics) \ | 1147 LIST_TEST(FlashMessageLoop_Basics) \ |
1325 LIST_TEST(FlashMessageLoop_RunWithoutQuit) \ | 1148 LIST_TEST(FlashMessageLoop_RunWithoutQuit) \ |
1326 ) | 1149 ) |
1327 | 1150 |
1328 IN_PROC_BROWSER_TEST_F(PPAPITest, FlashMessageLoop) { | |
1329 RUN_FLASH_MESSAGE_LOOP_SUBTESTS; | |
1330 } | |
1331 #if defined(OS_LINUX) // Disabled due to flakiness http://crbug.com/316925 | 1151 #if defined(OS_LINUX) // Disabled due to flakiness http://crbug.com/316925 |
1332 #define MAYBE_FlashMessageLoop DISABLED_FlashMessageLoop | 1152 #define MAYBE_FlashMessageLoop DISABLED_FlashMessageLoop |
1333 #else | 1153 #else |
1334 #define MAYBE_FlashMessageLoop FlashMessageLoop | 1154 #define MAYBE_FlashMessageLoop FlashMessageLoop |
1335 #endif | 1155 #endif |
1336 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_FlashMessageLoop) { | 1156 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_FlashMessageLoop) { |
1337 RUN_FLASH_MESSAGE_LOOP_SUBTESTS; | 1157 RUN_FLASH_MESSAGE_LOOP_SUBTESTS; |
1338 } | 1158 } |
1339 | 1159 |
1340 // The compositor test timeouts sometimes, so we have to split it to two | 1160 // The compositor test timeouts sometimes, so we have to split it to two |
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1441 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, FlashDRM) { | 1261 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, FlashDRM) { |
1442 RunTest( | 1262 RunTest( |
1443 #if (defined(OS_WIN) && defined(ENABLE_RLZ)) || defined(OS_CHROMEOS) | 1263 #if (defined(OS_WIN) && defined(ENABLE_RLZ)) || defined(OS_CHROMEOS) |
1444 // Only implemented on Windows and ChromeOS currently. | 1264 // Only implemented on Windows and ChromeOS currently. |
1445 LIST_TEST(FlashDRM_GetDeviceID) | 1265 LIST_TEST(FlashDRM_GetDeviceID) |
1446 #endif | 1266 #endif |
1447 LIST_TEST(FlashDRM_GetHmonitor) | 1267 LIST_TEST(FlashDRM_GetHmonitor) |
1448 LIST_TEST(FlashDRM_GetVoucherFile)); | 1268 LIST_TEST(FlashDRM_GetVoucherFile)); |
1449 } | 1269 } |
1450 | 1270 |
1451 TEST_PPAPI_IN_PROCESS(TalkPrivate) | |
1452 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) | 1271 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) |
1453 | 1272 |
1454 #if defined(OS_CHROMEOS) | 1273 #if defined(OS_CHROMEOS) |
1455 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) | 1274 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) |
1456 #endif | 1275 #endif |
1457 | 1276 |
1458 #if !defined(DISABLE_NACL) | 1277 #if !defined(DISABLE_NACL) |
1459 class PackagedAppTest : public ExtensionBrowserTest { | 1278 class PackagedAppTest : public ExtensionBrowserTest { |
1460 public: | 1279 public: |
1461 explicit PackagedAppTest(const std::string& toolchain) | 1280 explicit PackagedAppTest(const std::string& toolchain) |
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1580 #endif | 1399 #endif |
1581 | 1400 |
1582 IN_PROC_BROWSER_TEST_F(MojoPPAPITest, MAYBE_MOJO(Mojo)) { | 1401 IN_PROC_BROWSER_TEST_F(MojoPPAPITest, MAYBE_MOJO(Mojo)) { |
1583 RunTest(); | 1402 RunTest(); |
1584 } | 1403 } |
1585 | 1404 |
1586 IN_PROC_BROWSER_TEST_F(MojoPPAPITest, MAYBE_MOJO(MojoFailsWithoutFlag)) { | 1405 IN_PROC_BROWSER_TEST_F(MojoPPAPITest, MAYBE_MOJO(MojoFailsWithoutFlag)) { |
1587 RunTestWithoutFlag(); | 1406 RunTestWithoutFlag(); |
1588 } | 1407 } |
1589 #endif | 1408 #endif |
OLD | NEW |