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

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

Issue 8536031: Reland http://codereview.chromium.org/8477015 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge AGAIN Created 9 years, 1 month 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_broker.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 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 TEST_PPAPI_NACL_VIA_HTTP(Var) 265 TEST_PPAPI_NACL_VIA_HTTP(Var)
266 266
267 TEST_PPAPI_IN_PROCESS(VarDeprecated) 267 TEST_PPAPI_IN_PROCESS(VarDeprecated)
268 // Disabled because it times out: http://crbug.com/89961 268 // Disabled because it times out: http://crbug.com/89961
269 //TEST_PPAPI_OUT_OF_PROCESS(VarDeprecated) 269 //TEST_PPAPI_OUT_OF_PROCESS(VarDeprecated)
270 270
271 // Windows defines 'PostMessage', so we have to undef it. 271 // Windows defines 'PostMessage', so we have to undef it.
272 #ifdef PostMessage 272 #ifdef PostMessage
273 #undef PostMessage 273 #undef PostMessage
274 #endif 274 #endif
275 TEST_PPAPI_IN_PROCESS(PostMessage) 275 TEST_PPAPI_IN_PROCESS(PostMessage_SendInInit)
276 TEST_PPAPI_IN_PROCESS(PostMessage_SendingData)
277 TEST_PPAPI_IN_PROCESS(PostMessage_MessageEvent)
278 TEST_PPAPI_IN_PROCESS(PostMessage_NoHandler)
279 TEST_PPAPI_IN_PROCESS(PostMessage_ExtraParam)
280 TEST_PPAPI_OUT_OF_PROCESS(PostMessage_SendInInit)
281 TEST_PPAPI_OUT_OF_PROCESS(PostMessage_SendingData)
282 TEST_PPAPI_OUT_OF_PROCESS(PostMessage_MessageEvent)
283 TEST_PPAPI_OUT_OF_PROCESS(PostMessage_NoHandler)
284 TEST_PPAPI_OUT_OF_PROCESS(PostMessage_ExtraParam)
276 #if !defined(OS_WIN) 285 #if !defined(OS_WIN)
277 // Times out on Windows XP: http://crbug.com/95557 286 // Times out on Windows XP: http://crbug.com/95557
278 TEST_PPAPI_OUT_OF_PROCESS(PostMessage) 287 TEST_PPAPI_OUT_OF_PROCESS(PostMessage_NonMainThread)
279 #endif 288 #endif
280 289
281 TEST_PPAPI_IN_PROCESS(Memory) 290 TEST_PPAPI_IN_PROCESS(Memory)
282 TEST_PPAPI_OUT_OF_PROCESS(Memory) 291 TEST_PPAPI_OUT_OF_PROCESS(Memory)
283 TEST_PPAPI_NACL_VIA_HTTP(Memory) 292 TEST_PPAPI_NACL_VIA_HTTP(Memory)
284 293
285 TEST_PPAPI_IN_PROCESS(VideoDecoder) 294 TEST_PPAPI_IN_PROCESS(VideoDecoder)
286 TEST_PPAPI_OUT_OF_PROCESS(VideoDecoder) 295 TEST_PPAPI_OUT_OF_PROCESS(VideoDecoder)
287 296
288 // http://crbug.com/90039 and http://crbug.com/83443 (Mac) 297 // http://crbug.com/90039 and http://crbug.com/83443 (Mac)
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
364 RunTest("UMA"); 373 RunTest("UMA");
365 } 374 }
366 375
367 TEST_PPAPI_IN_PROCESS(NetAddressPrivate) 376 TEST_PPAPI_IN_PROCESS(NetAddressPrivate)
368 TEST_PPAPI_OUT_OF_PROCESS(NetAddressPrivate) 377 TEST_PPAPI_OUT_OF_PROCESS(NetAddressPrivate)
369 378
370 // PPB_TCPSocket_Private currently isn't supported in-process. 379 // PPB_TCPSocket_Private currently isn't supported in-process.
371 TEST_F(OutOfProcessPPAPITest, TCPSocketPrivate) { 380 TEST_F(OutOfProcessPPAPITest, TCPSocketPrivate) {
372 RunTestViaHTTP("TCPSocketPrivate"); 381 RunTestViaHTTP("TCPSocketPrivate");
373 } 382 }
OLDNEW
« no previous file with comments | « no previous file | ppapi/tests/test_broker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698