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

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: . 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
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/path_service.h" 9 #include "base/path_service.h"
10 #include "base/stringprintf.h" 10 #include "base/stringprintf.h"
(...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after
452 #define MAYBE_InputEvent DISABLED_InputEvent 452 #define MAYBE_InputEvent DISABLED_InputEvent
453 #else 453 #else
454 #define MAYBE_InputEvent InputEvent 454 #define MAYBE_InputEvent InputEvent
455 #endif 455 #endif
456 456
457 TEST_PPAPI_IN_PROCESS(MAYBE_InputEvent) 457 TEST_PPAPI_IN_PROCESS(MAYBE_InputEvent)
458 TEST_PPAPI_OUT_OF_PROCESS(MAYBE_InputEvent) 458 TEST_PPAPI_OUT_OF_PROCESS(MAYBE_InputEvent)
459 // TODO(bbudge) Enable when input events are proxied correctly for NaCl. 459 // TODO(bbudge) Enable when input events are proxied correctly for NaCl.
460 TEST_PPAPI_NACL_VIA_HTTP(DISABLED_InputEvent) 460 TEST_PPAPI_NACL_VIA_HTTP(DISABLED_InputEvent)
461 461
462 TEST_PPAPI_IN_PROCESS(ImeInputEvent)
463 TEST_PPAPI_OUT_OF_PROCESS(ImeInputEvent)
464 // TODO(kinaba) Enable when IME events are proxied correctly for NaCl.
465 TEST_PPAPI_NACL_VIA_HTTP(DISABLED_ImeInputEvent)
466
462 TEST_PPAPI_IN_PROCESS(Instance_ExecuteScript); 467 TEST_PPAPI_IN_PROCESS(Instance_ExecuteScript);
463 TEST_PPAPI_OUT_OF_PROCESS(Instance_ExecuteScript) 468 TEST_PPAPI_OUT_OF_PROCESS(Instance_ExecuteScript)
464 // ExecuteScript isn't supported by NaCl. 469 // ExecuteScript isn't supported by NaCl.
465 470
466 // We run and reload the RecursiveObjects test to ensure that the InstanceObject 471 // We run and reload the RecursiveObjects test to ensure that the InstanceObject
467 // (and others) are properly cleaned up after the first run. 472 // (and others) are properly cleaned up after the first run.
468 IN_PROC_BROWSER_TEST_F(PPAPITest, Instance_RecursiveObjects) { 473 IN_PROC_BROWSER_TEST_F(PPAPITest, Instance_RecursiveObjects) {
469 RunTestAndReload("Instance_RecursiveObjects"); 474 RunTestAndReload("Instance_RecursiveObjects");
470 } 475 }
471 // TODO(dmichael): Make it work out-of-process (or at least see whether we 476 // TODO(dmichael): Make it work out-of-process (or at least see whether we
(...skipping 545 matching lines...) Expand 10 before | Expand all | Expand 10 after
1017 TEST_PPAPI_IN_PROCESS(FlashMessageLoop_Basics) 1022 TEST_PPAPI_IN_PROCESS(FlashMessageLoop_Basics)
1018 TEST_PPAPI_IN_PROCESS(FlashMessageLoop_RunWithoutQuit) 1023 TEST_PPAPI_IN_PROCESS(FlashMessageLoop_RunWithoutQuit)
1019 TEST_PPAPI_OUT_OF_PROCESS(FlashMessageLoop_Basics) 1024 TEST_PPAPI_OUT_OF_PROCESS(FlashMessageLoop_Basics)
1020 TEST_PPAPI_OUT_OF_PROCESS(FlashMessageLoop_RunWithoutQuit) 1025 TEST_PPAPI_OUT_OF_PROCESS(FlashMessageLoop_RunWithoutQuit)
1021 1026
1022 TEST_PPAPI_IN_PROCESS(MouseCursor) 1027 TEST_PPAPI_IN_PROCESS(MouseCursor)
1023 TEST_PPAPI_OUT_OF_PROCESS(MouseCursor) 1028 TEST_PPAPI_OUT_OF_PROCESS(MouseCursor)
1024 TEST_PPAPI_NACL_VIA_HTTP(MouseCursor) 1029 TEST_PPAPI_NACL_VIA_HTTP(MouseCursor)
1025 1030
1026 #endif // ADDRESS_SANITIZER 1031 #endif // ADDRESS_SANITIZER
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698