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

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: Fix. 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 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 } 330 }
331 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, TCPSocket) { 331 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, TCPSocket) {
332 RunTestViaHTTP( 332 RunTestViaHTTP(
333 LIST_TEST(TCPSocket_Connect) 333 LIST_TEST(TCPSocket_Connect)
334 LIST_TEST(TCPSocket_ReadWrite) 334 LIST_TEST(TCPSocket_ReadWrite)
335 LIST_TEST(TCPSocket_SetOption) 335 LIST_TEST(TCPSocket_SetOption)
336 ); 336 );
337 } 337 }
338 338
339 TEST_PPAPI_OUT_OF_PROCESS_WITH_SSL_SERVER(TCPSocketPrivate) 339 TEST_PPAPI_OUT_OF_PROCESS_WITH_SSL_SERVER(TCPSocketPrivate)
340 TEST_PPAPI_IN_PROCESS_WITH_SSL_SERVER(TCPSocketPrivate)
341 TEST_PPAPI_NACL_WITH_SSL_SERVER(TCPSocketPrivate) 340 TEST_PPAPI_NACL_WITH_SSL_SERVER(TCPSocketPrivate)
342 341
343 TEST_PPAPI_OUT_OF_PROCESS_WITH_SSL_SERVER(TCPSocketPrivateTrusted) 342 TEST_PPAPI_OUT_OF_PROCESS_WITH_SSL_SERVER(TCPSocketPrivateTrusted)
344 TEST_PPAPI_IN_PROCESS_WITH_SSL_SERVER(TCPSocketPrivateTrusted)
345 343
346 // UDPSocket tests. 344 // UDPSocket tests.
347 // UDPSocket_Broadcast is disabled for OSX because it requires root permissions 345 // UDPSocket_Broadcast is disabled for OSX because it requires root permissions
348 // on OSX 10.7+. 346 // on OSX 10.7+.
349 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, UDPSocket) { 347 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, UDPSocket) {
350 RunTestViaHTTP( 348 RunTestViaHTTP(
351 LIST_TEST(UDPSocket_ReadWrite) 349 LIST_TEST(UDPSocket_ReadWrite)
352 LIST_TEST(UDPSocket_SetOption) 350 LIST_TEST(UDPSocket_SetOption)
353 #if !defined(OS_MACOSX) 351 #if !defined(OS_MACOSX)
354 LIST_TEST(UDPSocket_Broadcast) 352 LIST_TEST(UDPSocket_Broadcast)
(...skipping 1154 matching lines...) Expand 10 before | Expand all | Expand 10 after
1509 #if (defined(OS_WIN) && defined(ENABLE_RLZ)) || defined(OS_CHROMEOS) 1507 #if (defined(OS_WIN) && defined(ENABLE_RLZ)) || defined(OS_CHROMEOS)
1510 // Only implemented on Windows and ChromeOS currently. 1508 // Only implemented on Windows and ChromeOS currently.
1511 LIST_TEST(FlashDRM_GetDeviceID) 1509 LIST_TEST(FlashDRM_GetDeviceID)
1512 #endif 1510 #endif
1513 LIST_TEST(FlashDRM_GetHmonitor) 1511 LIST_TEST(FlashDRM_GetHmonitor)
1514 LIST_TEST(FlashDRM_GetVoucherFile)); 1512 LIST_TEST(FlashDRM_GetVoucherFile));
1515 } 1513 }
1516 1514
1517 TEST_PPAPI_IN_PROCESS(TalkPrivate) 1515 TEST_PPAPI_IN_PROCESS(TalkPrivate)
1518 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) 1516 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698