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 <stdio.h> | 5 #include <stdio.h> |
6 #if defined(OS_POSIX) | 6 #if defined(OS_POSIX) |
7 #include <unistd.h> | 7 #include <unistd.h> |
8 #elif defined(OS_WIN) | 8 #elif defined(OS_WIN) |
9 #include <windows.h> | 9 #include <windows.h> |
10 #endif | 10 #endif |
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
113 | 113 |
114 IN_PROC_BROWSER_TEST_F(NaClBrowserTestStatic, SameOriginCookie) { | 114 IN_PROC_BROWSER_TEST_F(NaClBrowserTestStatic, SameOriginCookie) { |
115 RunLoadTest(FILE_PATH_LITERAL("cross_origin/same_origin_cookie.html")); | 115 RunLoadTest(FILE_PATH_LITERAL("cross_origin/same_origin_cookie.html")); |
116 } | 116 } |
117 | 117 |
118 IN_PROC_BROWSER_TEST_F(NaClBrowserTestStatic, CORSNoCookie) { | 118 IN_PROC_BROWSER_TEST_F(NaClBrowserTestStatic, CORSNoCookie) { |
119 RunLoadTest(FILE_PATH_LITERAL("cross_origin/cors_no_cookie.html")); | 119 RunLoadTest(FILE_PATH_LITERAL("cross_origin/cors_no_cookie.html")); |
120 } | 120 } |
121 | 121 |
122 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl, | 122 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl, |
123 MAYBE_PNACL(PnaclErrorHandling)) { | 123 DISABLED_PnaclErrorHandling) { |
jvoung (off chromium)
2013/09/09 23:24:28
You could also just change chrome/test/data/nacl/p
Derek Schuff
2013/09/09 23:45:40
Done.
| |
124 RunNaClIntegrationTest(FILE_PATH_LITERAL("pnacl_error_handling.html")); | 124 RunNaClIntegrationTest(FILE_PATH_LITERAL("pnacl_error_handling.html")); |
125 } | 125 } |
126 | 126 |
127 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl, | 127 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl, |
128 MAYBE_PNACL(PnaclNMFOptionsO0)) { | 128 MAYBE_PNACL(PnaclNMFOptionsO0)) { |
129 RunLoadTest(FILE_PATH_LITERAL("pnacl_options.html?use_nmf=o_0")); | 129 RunLoadTest(FILE_PATH_LITERAL("pnacl_options.html?use_nmf=o_0")); |
130 } | 130 } |
131 | 131 |
132 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl, | 132 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl, |
133 MAYBE_PNACL(PnaclNMFOptionsO2)) { | 133 MAYBE_PNACL(PnaclNMFOptionsO2)) { |
(...skipping 19 matching lines...) Expand all Loading... | |
153 | 153 |
154 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl, PnaclMimeType) { | 154 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl, PnaclMimeType) { |
155 RunLoadTest(FILE_PATH_LITERAL("pnacl_mime_type.html")); | 155 RunLoadTest(FILE_PATH_LITERAL("pnacl_mime_type.html")); |
156 } | 156 } |
157 | 157 |
158 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclDisabled, PnaclMimeType) { | 158 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclDisabled, PnaclMimeType) { |
159 RunLoadTest(FILE_PATH_LITERAL("pnacl_mime_type.html")); | 159 RunLoadTest(FILE_PATH_LITERAL("pnacl_mime_type.html")); |
160 } | 160 } |
161 | 161 |
162 } // namespace | 162 } // namespace |
OLD | NEW |