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

Side by Side Diff: chrome/test/ui/ppapi_uitest.cc

Issue 8698007: Revert r111596 "WebSocket Pepper API: in process API implementation" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years 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 | ppapi/tests/test_websocket.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "base/file_util.h" 5 #include "base/file_util.h"
6 #include "base/path_service.h" 6 #include "base/path_service.h"
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 "content/browser/plugin_service.h" 9 #include "content/browser/plugin_service.h"
10 #include "content/public/common/content_switches.h" 10 #include "content/public/common/content_switches.h"
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 // Similar macros that test over HTTP. 224 // Similar macros that test over HTTP.
225 #define TEST_PPAPI_IN_PROCESS_VIA_HTTP(test_name) \ 225 #define TEST_PPAPI_IN_PROCESS_VIA_HTTP(test_name) \
226 TEST_F(PPAPITest, test_name) { \ 226 TEST_F(PPAPITest, test_name) { \
227 RunTestViaHTTP(#test_name); \ 227 RunTestViaHTTP(#test_name); \
228 } 228 }
229 #define TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(test_name) \ 229 #define TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(test_name) \
230 TEST_F(OutOfProcessPPAPITest, test_name) { \ 230 TEST_F(OutOfProcessPPAPITest, test_name) { \
231 RunTestViaHTTP(#test_name); \ 231 RunTestViaHTTP(#test_name); \
232 } 232 }
233 233
234 // Similar macros that test with WebSocket server
235 #define TEST_PPAPI_IN_PROCESS_WITH_WS(test_name) \
236 TEST_F(PPAPITest, test_name) { \
237 RunTestWithWebSocketServer(#test_name); \
238 }
239 #define TEST_PPAPI_OUT_OF_PROCESS_WITH_WS(test_name) \
240 TEST_F(OutOfProcessPPAPITest, test_name) { \
241 RunTestWithWebSocketServer(#test_name); \
242 }
243
244
245 234
246 // NaCl based PPAPI tests 235 // NaCl based PPAPI tests
247 #define TEST_PPAPI_NACL_VIA_HTTP(test_name) \ 236 #define TEST_PPAPI_NACL_VIA_HTTP(test_name) \
248 TEST_F(PPAPINaClTest, test_name) { \ 237 TEST_F(PPAPINaClTest, test_name) { \
249 RunTestViaHTTP(#test_name); \ 238 RunTestViaHTTP(#test_name); \
250 } 239 }
251 240
252 // 241 //
253 // Interface tests. 242 // Interface tests.
254 // 243 //
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
464 TEST_PPAPI_IN_PROCESS(Flash_GetProxyForURL) 453 TEST_PPAPI_IN_PROCESS(Flash_GetProxyForURL)
465 TEST_PPAPI_IN_PROCESS(Flash_MessageLoop) 454 TEST_PPAPI_IN_PROCESS(Flash_MessageLoop)
466 TEST_PPAPI_IN_PROCESS(Flash_GetLocalTimeZoneOffset) 455 TEST_PPAPI_IN_PROCESS(Flash_GetLocalTimeZoneOffset)
467 TEST_PPAPI_IN_PROCESS(Flash_GetCommandLineArgs) 456 TEST_PPAPI_IN_PROCESS(Flash_GetCommandLineArgs)
468 TEST_PPAPI_OUT_OF_PROCESS(Flash_SetInstanceAlwaysOnTop) 457 TEST_PPAPI_OUT_OF_PROCESS(Flash_SetInstanceAlwaysOnTop)
469 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetProxyForURL) 458 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetProxyForURL)
470 TEST_PPAPI_OUT_OF_PROCESS(Flash_MessageLoop) 459 TEST_PPAPI_OUT_OF_PROCESS(Flash_MessageLoop)
471 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetLocalTimeZoneOffset) 460 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetLocalTimeZoneOffset)
472 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetCommandLineArgs) 461 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetCommandLineArgs)
473 462
474 TEST_PPAPI_IN_PROCESS(WebSocket_InvalidConnect) 463 TEST_PPAPI_IN_PROCESS(WebSocket_Create)
475 TEST_PPAPI_IN_PROCESS(WebSocket_IsWebSocket) 464 TEST_PPAPI_IN_PROCESS(WebSocket_IsWebSocket)
476 TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_ValidConnect)
477 TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_TextSendReceive)
478 465
479 #endif // ADDRESS_SANITIZER 466 #endif // ADDRESS_SANITIZER
OLDNEW
« no previous file with comments | « no previous file | ppapi/tests/test_websocket.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698