| 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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 }) | 78 }) |
| 79 | 79 |
| 80 NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_PPAPICore, { | 80 NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_PPAPICore, { |
| 81 RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_ppb_core.html")); | 81 RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_ppb_core.html")); |
| 82 }) | 82 }) |
| 83 | 83 |
| 84 NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_ProgressEvents, { | 84 NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_ProgressEvents, { |
| 85 RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_progress_events.html")); | 85 RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_progress_events.html")); |
| 86 }) | 86 }) |
| 87 | 87 |
| 88 NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_PnaclMimeType, { | |
| 89 RunLoadTest(FILE_PATH_LITERAL("pnacl_mime_type.html")); | |
| 90 }) | |
| 91 | |
| 92 // Some versions of Visual Studio does not like preprocessor | 88 // Some versions of Visual Studio does not like preprocessor |
| 93 // conditionals inside the argument of a macro, so we put the | 89 // conditionals inside the argument of a macro, so we put the |
| 94 // conditionals on a helper function. We are already in an anonymous | 90 // conditionals on a helper function. We are already in an anonymous |
| 95 // namespace, so the name of the helper is not visible in external | 91 // namespace, so the name of the helper is not visible in external |
| 96 // scope. | 92 // scope. |
| 97 #if defined(OS_POSIX) | 93 #if defined(OS_POSIX) |
| 98 base::FilePath::StringType NumberOfCoresAsFilePathString() { | 94 base::FilePath::StringType NumberOfCoresAsFilePathString() { |
| 99 char string_rep[23]; | 95 char string_rep[23]; |
| 100 long nprocessors = sysconf(_SC_NPROCESSORS_ONLN); | 96 long nprocessors = sysconf(_SC_NPROCESSORS_ONLN); |
| 101 #if TELEMETRY | 97 #if TELEMETRY |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 185 RunNaClIntegrationTest(FILE_PATH_LITERAL( | 181 RunNaClIntegrationTest(FILE_PATH_LITERAL( |
| 186 "pnacl_dyncode_syscall_disabled.html")); | 182 "pnacl_dyncode_syscall_disabled.html")); |
| 187 } | 183 } |
| 188 | 184 |
| 189 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl, | 185 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl, |
| 190 MAYBE_PNACL(PnaclExceptionHandlingDisabled)) { | 186 MAYBE_PNACL(PnaclExceptionHandlingDisabled)) { |
| 191 RunNaClIntegrationTest(FILE_PATH_LITERAL( | 187 RunNaClIntegrationTest(FILE_PATH_LITERAL( |
| 192 "pnacl_exception_handling_disabled.html")); | 188 "pnacl_exception_handling_disabled.html")); |
| 193 } | 189 } |
| 194 | 190 |
| 191 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl, MAYBE_PNACL(PnaclMimeType)) { |
| 192 RunLoadTest(FILE_PATH_LITERAL("pnacl_mime_type.html")); |
| 193 } |
| 194 |
| 195 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclDisabled, |
| 196 MAYBE_PNACL(PnaclMimeType)) { |
| 197 RunLoadTest(FILE_PATH_LITERAL("pnacl_mime_type.html")); |
| 198 } |
| 199 |
| 195 } // namespace | 200 } // namespace |
| OLD | NEW |