Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1331)

Side by Side Diff: chrome/test/ppapi/ppapi_browsertest.cc

Issue 1837833004: Remove in-process PPB_Graphics3D (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix compile errors Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | content/renderer/pepper/ppb_graphics_3d_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "base/win/windows_version.h" 10 #include "base/win/windows_version.h"
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 TEST_PPAPI_NACL(Graphics2D_Replace) 234 TEST_PPAPI_NACL(Graphics2D_Replace)
235 TEST_PPAPI_NACL(Graphics2D_Flush) 235 TEST_PPAPI_NACL(Graphics2D_Flush)
236 TEST_PPAPI_NACL(Graphics2D_FlushOffscreenUpdate) 236 TEST_PPAPI_NACL(Graphics2D_FlushOffscreenUpdate)
237 TEST_PPAPI_NACL(Graphics2D_BindNull) 237 TEST_PPAPI_NACL(Graphics2D_BindNull)
238 238
239 #if defined(OS_WIN) 239 #if defined(OS_WIN)
240 #if defined(USE_AURA) 240 #if defined(USE_AURA)
241 // These tests fail with the test compositor which is what's used by default for 241 // These tests fail with the test compositor which is what's used by default for
242 // browser tests on Windows Aura. Renable when the software compositor is 242 // browser tests on Windows Aura. Renable when the software compositor is
243 // available. 243 // available.
244 #define MAYBE_IN_Graphics3D DISABLED_Graphics3D
245 #define MAYBE_OUT_Graphics3D DISABLED_Graphics3D 244 #define MAYBE_OUT_Graphics3D DISABLED_Graphics3D
246 #define MAYBE_NACL_Graphics3D DISABLED_Graphics3D 245 #define MAYBE_NACL_Graphics3D DISABLED_Graphics3D
247 #else // defined(USE_AURA) 246 #else // defined(USE_AURA)
248 // In-process and NaCl tests are having flaky failures on Win: crbug.com/242252 247 // NaCl tests are having flaky failures on Win: crbug.com/242252
249 #define MAYBE_IN_Graphics3D DISABLED_Graphics3D
250 #define MAYBE_OUT_Graphics3D Graphics3D 248 #define MAYBE_OUT_Graphics3D Graphics3D
251 #define MAYBE_NACL_Graphics3D DISABLED_Graphics3D 249 #define MAYBE_NACL_Graphics3D DISABLED_Graphics3D
252 #endif // defined(USE_AURA) 250 #endif // defined(USE_AURA)
253 #elif defined(OS_MACOSX) 251 #elif defined(OS_MACOSX)
254 // These tests fail when using the legacy software mode. Reenable when the 252 // These tests fail when using the legacy software mode. Reenable when the
255 // software compositor is enabled crbug.com/286038 253 // software compositor is enabled crbug.com/286038
256 #define MAYBE_IN_Graphics3D DISABLED_Graphics3D
257 #define MAYBE_OUT_Graphics3D DISABLED_Graphics3D 254 #define MAYBE_OUT_Graphics3D DISABLED_Graphics3D
258 #define MAYBE_NACL_Graphics3D DISABLED_Graphics3D 255 #define MAYBE_NACL_Graphics3D DISABLED_Graphics3D
259 #else 256 #else
260 // The tests are failing in-process. crbug.com/280282
261 #define MAYBE_IN_Graphics3D DISABLED_Graphics3D
262 #define MAYBE_OUT_Graphics3D Graphics3D 257 #define MAYBE_OUT_Graphics3D Graphics3D
263 #define MAYBE_NACL_Graphics3D Graphics3D 258 #define MAYBE_NACL_Graphics3D Graphics3D
264 #endif 259 #endif
265 TEST_PPAPI_OUT_OF_PROCESS(MAYBE_OUT_Graphics3D) 260 TEST_PPAPI_OUT_OF_PROCESS(MAYBE_OUT_Graphics3D)
266 TEST_PPAPI_NACL(MAYBE_NACL_Graphics3D) 261 TEST_PPAPI_NACL(MAYBE_NACL_Graphics3D)
267 262
268 TEST_PPAPI_NACL(ImageData) 263 TEST_PPAPI_NACL(ImageData)
269 264
270 // TCPSocket and TCPSocketPrivate tests. 265 // TCPSocket and TCPSocketPrivate tests.
271 #define RUN_TCPSOCKET_SUBTESTS \ 266 #define RUN_TCPSOCKET_SUBTESTS \
(...skipping 1036 matching lines...) Expand 10 before | Expand all | Expand 10 after
1308 MAYBE_PPAPI_NACL(NoSocketPermissions)) { 1303 MAYBE_PPAPI_NACL(NoSocketPermissions)) {
1309 RunTests("no_socket_permissions"); 1304 RunTests("no_socket_permissions");
1310 } 1305 }
1311 1306
1312 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, 1307 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest,
1313 MAYBE_PPAPI_NACL(SocketPermissions)) { 1308 MAYBE_PPAPI_NACL(SocketPermissions)) {
1314 RunTests("socket_permissions"); 1309 RunTests("socket_permissions");
1315 } 1310 }
1316 1311
1317 #endif 1312 #endif
OLDNEW
« no previous file with comments | « no previous file | content/renderer/pepper/ppb_graphics_3d_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698