| 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 <stddef.h> | 5 #include <stddef.h> |
| 6 | 6 |
| 7 #include "base/macros.h" | 7 #include "base/macros.h" |
| 8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
| 9 #include "base/test/test_timeouts.h" | 9 #include "base/test/test_timeouts.h" |
| 10 #include "build/build_config.h" | 10 #include "build/build_config.h" |
| (...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 244 // TODO(jhorwich) Enable when Graphics2D_Dev interfaces are proxied in NaCl. | 244 // TODO(jhorwich) Enable when Graphics2D_Dev interfaces are proxied in NaCl. |
| 245 TEST_PPAPI_NACL(Graphics2D_InvalidResource) | 245 TEST_PPAPI_NACL(Graphics2D_InvalidResource) |
| 246 TEST_PPAPI_NACL(Graphics2D_InvalidSize) | 246 TEST_PPAPI_NACL(Graphics2D_InvalidSize) |
| 247 TEST_PPAPI_NACL(Graphics2D_Humongous) | 247 TEST_PPAPI_NACL(Graphics2D_Humongous) |
| 248 TEST_PPAPI_NACL(Graphics2D_InitToZero) | 248 TEST_PPAPI_NACL(Graphics2D_InitToZero) |
| 249 TEST_PPAPI_NACL(Graphics2D_Describe) | 249 TEST_PPAPI_NACL(Graphics2D_Describe) |
| 250 TEST_PPAPI_NACL(Graphics2D_Paint) | 250 TEST_PPAPI_NACL(Graphics2D_Paint) |
| 251 TEST_PPAPI_NACL(Graphics2D_Scroll) | 251 TEST_PPAPI_NACL(Graphics2D_Scroll) |
| 252 TEST_PPAPI_NACL(Graphics2D_Replace) | 252 TEST_PPAPI_NACL(Graphics2D_Replace) |
| 253 TEST_PPAPI_NACL(Graphics2D_Flush) | 253 TEST_PPAPI_NACL(Graphics2D_Flush) |
| 254 TEST_PPAPI_NACL(Graphics2D_FlushOffscreenUpdate) | 254 // TODO(crbug.com/682275): Flaky on Ubuntu. |
| 255 // TEST_PPAPI_NACL(Graphics2D_FlushOffscreenUpdate) |
| 255 TEST_PPAPI_NACL(Graphics2D_BindNull) | 256 TEST_PPAPI_NACL(Graphics2D_BindNull) |
| 256 | 257 |
| 257 #if defined(OS_WIN) | 258 #if defined(OS_WIN) |
| 258 #if defined(USE_AURA) | 259 #if defined(USE_AURA) |
| 259 // These tests fail with the test compositor which is what's used by default for | 260 // These tests fail with the test compositor which is what's used by default for |
| 260 // browser tests on Windows Aura. Renable when the software compositor is | 261 // browser tests on Windows Aura. Renable when the software compositor is |
| 261 // available. | 262 // available. |
| 262 #define MAYBE_OUT_Graphics3D DISABLED_Graphics3D | 263 #define MAYBE_OUT_Graphics3D DISABLED_Graphics3D |
| 263 #define MAYBE_NACL_Graphics3D DISABLED_Graphics3D | 264 #define MAYBE_NACL_Graphics3D DISABLED_Graphics3D |
| 264 #else // defined(USE_AURA) | 265 #else // defined(USE_AURA) |
| (...skipping 1060 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1325 MAYBE_PPAPI_NACL(NoSocketPermissions)) { | 1326 MAYBE_PPAPI_NACL(NoSocketPermissions)) { |
| 1326 RunTests("no_socket_permissions"); | 1327 RunTests("no_socket_permissions"); |
| 1327 } | 1328 } |
| 1328 | 1329 |
| 1329 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, | 1330 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, |
| 1330 MAYBE_PPAPI_NACL(SocketPermissions)) { | 1331 MAYBE_PPAPI_NACL(SocketPermissions)) { |
| 1331 RunTests("socket_permissions"); | 1332 RunTests("socket_permissions"); |
| 1332 } | 1333 } |
| 1333 | 1334 |
| 1334 #endif | 1335 #endif |
| OLD | NEW |