| 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 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 123 } | 123 } |
| 124 | 124 |
| 125 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, IrtException) { | 125 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, IrtException) { |
| 126 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html")); | 126 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html")); |
| 127 } | 127 } |
| 128 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi, | 128 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi, |
| 129 MAYBE_PNACL_NONSFI(IrtException)) { | 129 MAYBE_PNACL_NONSFI(IrtException)) { |
| 130 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html")); | 130 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html")); |
| 131 } | 131 } |
| 132 | 132 |
| 133 NACL_BROWSER_TEST_F(NaClBrowserTest, Nameservice, { | |
| 134 RunNaClIntegrationTest(FILE_PATH_LITERAL("pm_nameservice_test.html")); | |
| 135 }) | |
| 136 | |
| 137 // Some versions of Visual Studio does not like preprocessor | 133 // Some versions of Visual Studio does not like preprocessor |
| 138 // conditionals inside the argument of a macro, so we put the | 134 // conditionals inside the argument of a macro, so we put the |
| 139 // conditionals on a helper function. We are already in an anonymous | 135 // conditionals on a helper function. We are already in an anonymous |
| 140 // namespace, so the name of the helper is not visible in external | 136 // namespace, so the name of the helper is not visible in external |
| 141 // scope. | 137 // scope. |
| 142 #if defined(OS_POSIX) | 138 #if defined(OS_POSIX) |
| 143 base::FilePath::StringType NumberOfCoresAsFilePathString() { | 139 base::FilePath::StringType NumberOfCoresAsFilePathString() { |
| 144 char string_rep[23]; | 140 char string_rep[23]; |
| 145 long nprocessors = sysconf(_SC_NPROCESSORS_ONLN); | 141 long nprocessors = sysconf(_SC_NPROCESSORS_ONLN); |
| 146 #if TELEMETRY | 142 #if TELEMETRY |
| (...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 359 } | 355 } |
| 360 | 356 |
| 361 // TODO(ncbray) support glibc and PNaCl | 357 // TODO(ncbray) support glibc and PNaCl |
| 362 // flaky: crbug.com/375894 | 358 // flaky: crbug.com/375894 |
| 363 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, DISABLED_MimeHandler) { | 359 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, DISABLED_MimeHandler) { |
| 364 RunNaClIntegrationTest(FILE_PATH_LITERAL( | 360 RunNaClIntegrationTest(FILE_PATH_LITERAL( |
| 365 "ppapi_extension_mime_handler.html")); | 361 "ppapi_extension_mime_handler.html")); |
| 366 } | 362 } |
| 367 | 363 |
| 368 } // namespace | 364 } // namespace |
| OLD | NEW |