Distinguish between keystroke and character events.

ui/events/event_processor_unittest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <vector>
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event.h"
 #include "ui/events/event_targeter.h"
 #include "ui/events/test/events_test_utils.h"
@@ skipping 234 matching lines @@
 
   ASSERT_EQ(1u, root()->child_count());
   ASSERT_EQ(1u, root()->child_at(0)->child_count());
   ASSERT_EQ(0u, root()->child_at(0)->child_at(0)->child_count());
 
   TestEventTarget* child_r = root()->child_at(0);
   TestEventTarget* grandchild_r = child_r->child_at(0);
 
   // When the root has a BubblingEventTargeter installed, events targeted
   // at the grandchild target should be dispatched to all three targets.
-  KeyEvent key_event(ET_KEY_PRESSED, VKEY_ESCAPE, 0, false);
+  KeyEvent key_event(ET_KEY_PRESSED, VKEY_ESCAPE, EF_NONE);
   DispatchEvent(&key_event);
   EXPECT_TRUE(root()->DidReceiveEvent(ET_KEY_PRESSED));
   EXPECT_TRUE(child_r->DidReceiveEvent(ET_KEY_PRESSED));
   EXPECT_TRUE(grandchild_r->DidReceiveEvent(ET_KEY_PRESSED));
   root()->ResetReceivedEvents();
   child_r->ResetReceivedEvents();
   grandchild_r->ResetReceivedEvents();
 
   // Add a pre-target handler on the child of the root that will mark the event
   // as handled. No targets in the hierarchy should receive the event.
   TestEventHandler handler;
   child_r->AddPreTargetHandler(&handler);
-  key_event = KeyEvent(ET_KEY_PRESSED, VKEY_ESCAPE, 0, false);
+  key_event = KeyEvent(ET_KEY_PRESSED, VKEY_ESCAPE, EF_NONE);
   DispatchEvent(&key_event);
   EXPECT_FALSE(root()->DidReceiveEvent(ET_KEY_PRESSED));
   EXPECT_FALSE(child_r->DidReceiveEvent(ET_KEY_PRESSED));
   EXPECT_FALSE(grandchild_r->DidReceiveEvent(ET_KEY_PRESSED));
   EXPECT_EQ(1, handler.num_key_events());
   handler.Reset();
 
   // Add a post-target handler on the child of the root that will mark the event
   // as handled. Only the grandchild (the initial target) should receive the
   // event.
   child_r->RemovePreTargetHandler(&handler);
   child_r->AddPostTargetHandler(&handler);
-  key_event = KeyEvent(ET_KEY_PRESSED, VKEY_ESCAPE, 0, false);
+  key_event = KeyEvent(ET_KEY_PRESSED, VKEY_ESCAPE, EF_NONE);
   DispatchEvent(&key_event);
   EXPECT_FALSE(root()->DidReceiveEvent(ET_KEY_PRESSED));
   EXPECT_FALSE(child_r->DidReceiveEvent(ET_KEY_PRESSED));
   EXPECT_TRUE(grandchild_r->DidReceiveEvent(ET_KEY_PRESSED));
   EXPECT_EQ(1, handler.num_key_events());
   handler.Reset();
   grandchild_r->ResetReceivedEvents();
   child_r->RemovePostTargetHandler(&handler);
 
   // Mark the event as handled when it reaches the EP_TARGET phase of
   // dispatch at the child of the root. The child and grandchild
   // targets should both receive the event, but the root should not.
   child_r->set_mark_events_as_handled(true);
-  key_event = KeyEvent(ET_KEY_PRESSED, VKEY_ESCAPE, 0, false);
+  key_event = KeyEvent(ET_KEY_PRESSED, VKEY_ESCAPE, EF_NONE);
   DispatchEvent(&key_event);
   EXPECT_FALSE(root()->DidReceiveEvent(ET_KEY_PRESSED));
   EXPECT_TRUE(child_r->DidReceiveEvent(ET_KEY_PRESSED));
   EXPECT_TRUE(grandchild_r->DidReceiveEvent(ET_KEY_PRESSED));
   root()->ResetReceivedEvents();
   child_r->ResetReceivedEvents();
   grandchild_r->ResetReceivedEvents();
   child_r->set_mark_events_as_handled(false);
 }
 
@@ skipping 59 matching lines @@
   DispatchEvent(&mouse);
 
   std::string expected[] = { "PreR", "PreC", "PreG", "G", "PostG", "PostC",
       "PostR", "PreR", "PreC", "C", "PostC", "PostR", "PreR", "R", "PostR" };
   EXPECT_EQ(std::vector<std::string>(
       expected, expected + arraysize(expected)), recorder);
 }
 
 }  // namespace test
 }  // namespace ui