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

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

Issue 10391101: Test for Pepper IME events. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments from kochi & merge master. Created 8 years, 7 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 | « no previous file | content/renderer/pepper/pepper_plugin_delegate_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/ui/ppapi_uitest.h" 5 #include "chrome/test/ui/ppapi_uitest.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 484 matching lines...) Expand 10 before | Expand all | Expand 10 after
495 #define MAYBE_InputEvent DISABLED_InputEvent 495 #define MAYBE_InputEvent DISABLED_InputEvent
496 #else 496 #else
497 #define MAYBE_InputEvent InputEvent 497 #define MAYBE_InputEvent InputEvent
498 #endif 498 #endif
499 499
500 TEST_PPAPI_IN_PROCESS(MAYBE_InputEvent) 500 TEST_PPAPI_IN_PROCESS(MAYBE_InputEvent)
501 TEST_PPAPI_OUT_OF_PROCESS(MAYBE_InputEvent) 501 TEST_PPAPI_OUT_OF_PROCESS(MAYBE_InputEvent)
502 // TODO(bbudge) Enable when input events are proxied correctly for NaCl. 502 // TODO(bbudge) Enable when input events are proxied correctly for NaCl.
503 TEST_PPAPI_NACL_VIA_HTTP(DISABLED_InputEvent) 503 TEST_PPAPI_NACL_VIA_HTTP(DISABLED_InputEvent)
504 504
505 TEST_PPAPI_IN_PROCESS(ImeInputEvent)
506 TEST_PPAPI_OUT_OF_PROCESS(ImeInputEvent)
507 // TODO(kinaba) Enable when IME events are proxied correctly for NaCl.
508 TEST_PPAPI_NACL_VIA_HTTP(DISABLED_ImeInputEvent)
509
505 TEST_PPAPI_IN_PROCESS(Instance_ExecuteScript); 510 TEST_PPAPI_IN_PROCESS(Instance_ExecuteScript);
506 TEST_PPAPI_OUT_OF_PROCESS(Instance_ExecuteScript) 511 TEST_PPAPI_OUT_OF_PROCESS(Instance_ExecuteScript)
507 // ExecuteScript isn't supported by NaCl. 512 // ExecuteScript isn't supported by NaCl.
508 513
509 // We run and reload the RecursiveObjects test to ensure that the InstanceObject 514 // We run and reload the RecursiveObjects test to ensure that the InstanceObject
510 // (and others) are properly cleaned up after the first run. 515 // (and others) are properly cleaned up after the first run.
511 IN_PROC_BROWSER_TEST_F(PPAPITest, Instance_RecursiveObjects) { 516 IN_PROC_BROWSER_TEST_F(PPAPITest, Instance_RecursiveObjects) {
512 RunTestAndReload("Instance_RecursiveObjects"); 517 RunTestAndReload("Instance_RecursiveObjects");
513 } 518 }
514 // TODO(dmichael): Make it work out-of-process (or at least see whether we 519 // TODO(dmichael): Make it work out-of-process (or at least see whether we
(...skipping 547 matching lines...) Expand 10 before | Expand all | Expand 10 after
1062 TEST_PPAPI_IN_PROCESS(FlashMessageLoop_Basics) 1067 TEST_PPAPI_IN_PROCESS(FlashMessageLoop_Basics)
1063 TEST_PPAPI_IN_PROCESS(FlashMessageLoop_RunWithoutQuit) 1068 TEST_PPAPI_IN_PROCESS(FlashMessageLoop_RunWithoutQuit)
1064 TEST_PPAPI_OUT_OF_PROCESS(FlashMessageLoop_Basics) 1069 TEST_PPAPI_OUT_OF_PROCESS(FlashMessageLoop_Basics)
1065 TEST_PPAPI_OUT_OF_PROCESS(FlashMessageLoop_RunWithoutQuit) 1070 TEST_PPAPI_OUT_OF_PROCESS(FlashMessageLoop_RunWithoutQuit)
1066 1071
1067 TEST_PPAPI_IN_PROCESS(MouseCursor) 1072 TEST_PPAPI_IN_PROCESS(MouseCursor)
1068 TEST_PPAPI_OUT_OF_PROCESS(MouseCursor) 1073 TEST_PPAPI_OUT_OF_PROCESS(MouseCursor)
1069 TEST_PPAPI_NACL_VIA_HTTP(MouseCursor) 1074 TEST_PPAPI_NACL_VIA_HTTP(MouseCursor)
1070 1075
1071 #endif // ADDRESS_SANITIZER 1076 #endif // ADDRESS_SANITIZER
OLDNEW
« no previous file with comments | « no previous file | content/renderer/pepper/pepper_plugin_delegate_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698