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

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

Issue 22923014: TCPSockets are switched to the new Pepper proxy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync. Created 7 years, 4 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
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 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 } 335 }
336 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, TCPSocket) { 336 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, TCPSocket) {
337 RunTestViaHTTP( 337 RunTestViaHTTP(
338 LIST_TEST(TCPSocket_Connect) 338 LIST_TEST(TCPSocket_Connect)
339 LIST_TEST(TCPSocket_ReadWrite) 339 LIST_TEST(TCPSocket_ReadWrite)
340 LIST_TEST(TCPSocket_SetOption) 340 LIST_TEST(TCPSocket_SetOption)
341 ); 341 );
342 } 342 }
343 343
344 TEST_PPAPI_OUT_OF_PROCESS_WITH_SSL_SERVER(TCPSocketPrivate) 344 TEST_PPAPI_OUT_OF_PROCESS_WITH_SSL_SERVER(TCPSocketPrivate)
345 TEST_PPAPI_IN_PROCESS_WITH_SSL_SERVER(TCPSocketPrivate)
346 TEST_PPAPI_NACL_WITH_SSL_SERVER(TCPSocketPrivate) 345 TEST_PPAPI_NACL_WITH_SSL_SERVER(TCPSocketPrivate)
347 346
348 TEST_PPAPI_OUT_OF_PROCESS_WITH_SSL_SERVER(TCPSocketPrivateTrusted) 347 TEST_PPAPI_OUT_OF_PROCESS_WITH_SSL_SERVER(TCPSocketPrivateTrusted)
349 TEST_PPAPI_IN_PROCESS_WITH_SSL_SERVER(TCPSocketPrivateTrusted)
350 348
351 // UDPSocket tests. 349 // UDPSocket tests.
352 // UDPSocket_Broadcast is disabled for OSX because it requires root permissions 350 // UDPSocket_Broadcast is disabled for OSX because it requires root permissions
353 // on OSX 10.7+. 351 // on OSX 10.7+.
354 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, UDPSocket) { 352 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, UDPSocket) {
355 RunTestViaHTTP( 353 RunTestViaHTTP(
356 LIST_TEST(UDPSocket_ReadWrite) 354 LIST_TEST(UDPSocket_ReadWrite)
357 LIST_TEST(UDPSocket_SetOption) 355 LIST_TEST(UDPSocket_SetOption)
358 #if !defined(OS_MACOSX) 356 #if !defined(OS_MACOSX)
359 LIST_TEST(UDPSocket_Broadcast) 357 LIST_TEST(UDPSocket_Broadcast)
(...skipping 1156 matching lines...) Expand 10 before | Expand all | Expand 10 after
1516 LIST_TEST(FlashDRM_GetDeviceID) 1514 LIST_TEST(FlashDRM_GetDeviceID)
1517 #endif 1515 #endif
1518 LIST_TEST(FlashDRM_GetHmonitor) 1516 LIST_TEST(FlashDRM_GetHmonitor)
1519 LIST_TEST(FlashDRM_GetVoucherFile)); 1517 LIST_TEST(FlashDRM_GetVoucherFile));
1520 } 1518 }
1521 1519
1522 TEST_PPAPI_IN_PROCESS(TalkPrivate) 1520 TEST_PPAPI_IN_PROCESS(TalkPrivate)
1523 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) 1521 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate)
1524 1522
1525 #endif // ADDRESS_SANITIZER 1523 #endif // ADDRESS_SANITIZER
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698