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

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, 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 | « chrome/browser/nacl_host/nacl_process_host.cc ('k') | content/browser/plugin_service_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 "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 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 } 342 }
343 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, TCPSocket) { 343 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, TCPSocket) {
344 RunTestViaHTTP( 344 RunTestViaHTTP(
345 LIST_TEST(TCPSocket_Connect) 345 LIST_TEST(TCPSocket_Connect)
346 LIST_TEST(TCPSocket_ReadWrite) 346 LIST_TEST(TCPSocket_ReadWrite)
347 LIST_TEST(TCPSocket_SetOption) 347 LIST_TEST(TCPSocket_SetOption)
348 ); 348 );
349 } 349 }
350 350
351 TEST_PPAPI_OUT_OF_PROCESS_WITH_SSL_SERVER(TCPSocketPrivate) 351 TEST_PPAPI_OUT_OF_PROCESS_WITH_SSL_SERVER(TCPSocketPrivate)
352 TEST_PPAPI_IN_PROCESS_WITH_SSL_SERVER(TCPSocketPrivate)
353 TEST_PPAPI_NACL_WITH_SSL_SERVER(TCPSocketPrivate) 352 TEST_PPAPI_NACL_WITH_SSL_SERVER(TCPSocketPrivate)
354 353
355 TEST_PPAPI_OUT_OF_PROCESS_WITH_SSL_SERVER(TCPSocketPrivateTrusted) 354 TEST_PPAPI_OUT_OF_PROCESS_WITH_SSL_SERVER(TCPSocketPrivateTrusted)
356 TEST_PPAPI_IN_PROCESS_WITH_SSL_SERVER(TCPSocketPrivateTrusted)
357 355
358 // UDPSocket tests. 356 // UDPSocket tests.
359 // UDPSocket_Broadcast is disabled for OSX because it requires root permissions 357 // UDPSocket_Broadcast is disabled for OSX because it requires root permissions
360 // on OSX 10.7+. 358 // on OSX 10.7+.
361 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, UDPSocket) { 359 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, UDPSocket) {
362 RunTestViaHTTP( 360 RunTestViaHTTP(
363 LIST_TEST(UDPSocket_ReadWrite) 361 LIST_TEST(UDPSocket_ReadWrite)
364 LIST_TEST(UDPSocket_SetOption) 362 LIST_TEST(UDPSocket_SetOption)
365 #if !defined(OS_MACOSX) 363 #if !defined(OS_MACOSX)
366 LIST_TEST(UDPSocket_Broadcast) 364 LIST_TEST(UDPSocket_Broadcast)
(...skipping 1165 matching lines...) Expand 10 before | Expand all | Expand 10 after
1532 #if (defined(OS_WIN) && defined(ENABLE_RLZ)) || defined(OS_CHROMEOS) 1530 #if (defined(OS_WIN) && defined(ENABLE_RLZ)) || defined(OS_CHROMEOS)
1533 // Only implemented on Windows and ChromeOS currently. 1531 // Only implemented on Windows and ChromeOS currently.
1534 LIST_TEST(FlashDRM_GetDeviceID) 1532 LIST_TEST(FlashDRM_GetDeviceID)
1535 #endif 1533 #endif
1536 LIST_TEST(FlashDRM_GetHmonitor) 1534 LIST_TEST(FlashDRM_GetHmonitor)
1537 LIST_TEST(FlashDRM_GetVoucherFile)); 1535 LIST_TEST(FlashDRM_GetVoucherFile));
1538 } 1536 }
1539 1537
1540 TEST_PPAPI_IN_PROCESS(TalkPrivate) 1538 TEST_PPAPI_IN_PROCESS(TalkPrivate)
1541 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) 1539 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate)
OLDNEW
« no previous file with comments | « chrome/browser/nacl_host/nacl_process_host.cc ('k') | content/browser/plugin_service_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698