| 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 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 199 // crbug.com/265624 | 199 // crbug.com/265624 |
| 200 #if defined(OS_WIN) | 200 #if defined(OS_WIN) |
| 201 command_line->AppendSwitch(switches::kNoSandbox); | 201 command_line->AppendSwitch(switches::kNoSandbox); |
| 202 #endif | 202 #endif |
| 203 // Don't actually debug the app though. | 203 // Don't actually debug the app though. |
| 204 command_line->AppendSwitchASCII(switches::kNaClDebugMask, | 204 command_line->AppendSwitchASCII(switches::kNaClDebugMask, |
| 205 "!<all_urls>"); | 205 "!<all_urls>"); |
| 206 } | 206 } |
| 207 }; | 207 }; |
| 208 | 208 |
| 209 #if defined(OS_WIN) |
| 210 #define MAYBE_PnaclDebugURLFlagAndURL DISABLED_PnaclDebugURLFlagAndURL |
| 211 #define MAYBE_PnaclDebugURLFlagNoURL DISABLED_PnaclDebugURLFlagNoURL |
| 212 #else |
| 213 #define MAYBE_PnaclDebugURLFlagAndURL PnaclDebugURLFlagAndURL |
| 214 #define MAYBE_PnaclDebugURLFlagNoURL PnaclDebugURLFlagNoURL |
| 215 #endif |
| 216 |
| 209 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclDebugURL, | 217 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclDebugURL, |
| 210 MAYBE_PNACL(PnaclDebugURLFlagAndURL)) { | 218 MAYBE_PnaclDebugURLFlagAndURL) { |
| 211 RunLoadTest(FILE_PATH_LITERAL( | 219 RunLoadTest(FILE_PATH_LITERAL( |
| 212 "pnacl_debug_url.html?nmf_file=pnacl_has_debug.nmf")); | 220 "pnacl_debug_url.html?nmf_file=pnacl_has_debug.nmf")); |
| 213 } | 221 } |
| 214 | 222 |
| 215 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclDebugURL, | 223 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclDebugURL, |
| 216 MAYBE_PNACL(PnaclDebugURLFlagNoURL)) { | 224 MAYBE_PnaclDebugURLFlagNoURL) { |
| 217 RunLoadTest(FILE_PATH_LITERAL( | 225 RunLoadTest(FILE_PATH_LITERAL( |
| 218 "pnacl_debug_url.html?nmf_file=pnacl_no_debug.nmf")); | 226 "pnacl_debug_url.html?nmf_file=pnacl_no_debug.nmf")); |
| 219 } | 227 } |
| 220 | 228 |
| 221 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl, | 229 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl, |
| 222 MAYBE_PNACL(PnaclDebugURLFlagOff)) { | 230 MAYBE_PNACL(PnaclDebugURLFlagOff)) { |
| 223 RunLoadTest(FILE_PATH_LITERAL( | 231 RunLoadTest(FILE_PATH_LITERAL( |
| 224 "pnacl_debug_url.html?nmf_file=pnacl_has_debug_flag_off.nmf")); | 232 "pnacl_debug_url.html?nmf_file=pnacl_has_debug_flag_off.nmf")); |
| 225 } | 233 } |
| 226 | 234 |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 342 } | 350 } |
| 343 }; | 351 }; |
| 344 | 352 |
| 345 // TODO(ncbray) support glibc and PNaCl | 353 // TODO(ncbray) support glibc and PNaCl |
| 346 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, MimeHandler) { | 354 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, MimeHandler) { |
| 347 RunNaClIntegrationTest(FILE_PATH_LITERAL( | 355 RunNaClIntegrationTest(FILE_PATH_LITERAL( |
| 348 "ppapi_extension_mime_handler.html")); | 356 "ppapi_extension_mime_handler.html")); |
| 349 } | 357 } |
| 350 | 358 |
| 351 } // namespace | 359 } // namespace |
| OLD | NEW |