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

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

Issue 10916052: Fixed UDP tests for MacOS X 10.7 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix. Created 8 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | net/udp/udp_socket_unittest.cc » ('j') | net/udp/udp_socket_unittest.cc » ('J')
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 "chrome/test/ppapi/ppapi_test.h" 5 #include "chrome/test/ppapi/ppapi_test.h"
6 6
7 #include "base/test/test_timeouts.h" 7 #include "base/test/test_timeouts.h"
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 #include "chrome/browser/content_settings/host_content_settings_map.h" 9 #include "chrome/browser/content_settings/host_content_settings_map.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 #define MAYBE_TCPSocketPrivate TCPSocketPrivate 280 #define MAYBE_TCPSocketPrivate TCPSocketPrivate
281 #endif 281 #endif
282 282
283 TEST_PPAPI_OUT_OF_PROCESS_WITH_SSL_SERVER(MAYBE_TCPSocketPrivate) 283 TEST_PPAPI_OUT_OF_PROCESS_WITH_SSL_SERVER(MAYBE_TCPSocketPrivate)
284 TEST_PPAPI_IN_PROCESS_WITH_SSL_SERVER(MAYBE_TCPSocketPrivate) 284 TEST_PPAPI_IN_PROCESS_WITH_SSL_SERVER(MAYBE_TCPSocketPrivate)
285 TEST_PPAPI_NACL_WITH_SSL_SERVER(MAYBE_TCPSocketPrivate) 285 TEST_PPAPI_NACL_WITH_SSL_SERVER(MAYBE_TCPSocketPrivate)
286 286
287 TEST_PPAPI_OUT_OF_PROCESS_WITH_SSL_SERVER(TCPSocketPrivateTrusted) 287 TEST_PPAPI_OUT_OF_PROCESS_WITH_SSL_SERVER(TCPSocketPrivateTrusted)
288 TEST_PPAPI_IN_PROCESS_WITH_SSL_SERVER(TCPSocketPrivateTrusted) 288 TEST_PPAPI_IN_PROCESS_WITH_SSL_SERVER(TCPSocketPrivateTrusted)
289 289
290 TEST_PPAPI_IN_PROCESS_VIA_HTTP(UDPSocketPrivate) 290 // UDPSocketPrivate tests.
291 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(UDPSocketPrivate) 291 TEST_PPAPI_IN_PROCESS_VIA_HTTP(UDPSocketPrivate_Connect)
292 TEST_PPAPI_NACL_VIA_HTTP(UDPSocketPrivate) 292 TEST_PPAPI_IN_PROCESS_VIA_HTTP(UDPSocketPrivate_ConnectFailure)
293 #if !defined(OS_MACOSX)
Sergey Ulanov 2012/09/05 22:23:56 Please add comment to explain why this test is dis
ygorshenin1 2012/09/06 08:01:26 Done.
294 TEST_PPAPI_IN_PROCESS_VIA_HTTP(UDPSocketPrivate_Broadcast)
295 #endif
Sergey Ulanov 2012/09/05 22:23:56 nit: // defined(OS_MACOSX)
ygorshenin1 2012/09/06 08:01:26 Done.
296 TEST_PPAPI_IN_PROCESS_VIA_HTTP(UDPSocketPrivate_SetSocketFeatureErrors)
297 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(UDPSocketPrivate_Connect)
298 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(UDPSocketPrivate_ConnectFailure)
299 #if !defined(OS_MACOSX)
300 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(UDPSocketPrivate_Broadcast)
301 #endif
302 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(UDPSocketPrivate_SetSocketFeatureErrors)
303 TEST_PPAPI_NACL_VIA_HTTP(UDPSocketPrivate_Connect)
304 TEST_PPAPI_NACL_VIA_HTTP(UDPSocketPrivate_ConnectFailure)
305 #if !defined(OS_MACOSX)
306 TEST_PPAPI_NACL_VIA_HTTP(UDPSocketPrivate_Broadcast)
307 #endif
308 TEST_PPAPI_NACL_VIA_HTTP(UDPSocketPrivate_SetSocketFeatureErrors)
293 309
294 TEST_PPAPI_NACL_VIA_HTTP_DISALLOWED_SOCKETS(TCPServerSocketPrivateDisallowed) 310 TEST_PPAPI_NACL_VIA_HTTP_DISALLOWED_SOCKETS(TCPServerSocketPrivateDisallowed)
295 TEST_PPAPI_NACL_VIA_HTTP_DISALLOWED_SOCKETS(TCPSocketPrivateDisallowed) 311 TEST_PPAPI_NACL_VIA_HTTP_DISALLOWED_SOCKETS(TCPSocketPrivateDisallowed)
296 TEST_PPAPI_NACL_VIA_HTTP_DISALLOWED_SOCKETS(UDPSocketPrivateDisallowed) 312 TEST_PPAPI_NACL_VIA_HTTP_DISALLOWED_SOCKETS(UDPSocketPrivateDisallowed)
297 313
298 TEST_PPAPI_IN_PROCESS_VIA_HTTP(TCPServerSocketPrivate) 314 TEST_PPAPI_IN_PROCESS_VIA_HTTP(TCPServerSocketPrivate)
299 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(TCPServerSocketPrivate) 315 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(TCPServerSocketPrivate)
300 TEST_PPAPI_NACL_VIA_HTTP(TCPServerSocketPrivate) 316 TEST_PPAPI_NACL_VIA_HTTP(TCPServerSocketPrivate)
301 317
302 TEST_PPAPI_IN_PROCESS_VIA_HTTP(HostResolverPrivate_Resolve) 318 TEST_PPAPI_IN_PROCESS_VIA_HTTP(HostResolverPrivate_Resolve)
(...skipping 583 matching lines...) Expand 10 before | Expand all | Expand 10 after
886 // Note to sheriffs: MessageLoop_Post starts a thread, which has a history of 902 // Note to sheriffs: MessageLoop_Post starts a thread, which has a history of
887 // slowness, particularly on Windows XP. If this test times out, please try 903 // slowness, particularly on Windows XP. If this test times out, please try
888 // marking it SLOW_ before disabling. 904 // marking it SLOW_ before disabling.
889 // - dmichael 905 // - dmichael
890 TEST_PPAPI_OUT_OF_PROCESS(MessageLoop_Post) 906 TEST_PPAPI_OUT_OF_PROCESS(MessageLoop_Post)
891 907
892 // Only enabled in out-of-process mode. 908 // Only enabled in out-of-process mode.
893 TEST_PPAPI_OUT_OF_PROCESS(FlashFile_CreateTemporaryFile) 909 TEST_PPAPI_OUT_OF_PROCESS(FlashFile_CreateTemporaryFile)
894 910
895 #endif // ADDRESS_SANITIZER 911 #endif // ADDRESS_SANITIZER
OLDNEW
« no previous file with comments | « no previous file | net/udp/udp_socket_unittest.cc » ('j') | net/udp/udp_socket_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698