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

Unified Diff: remoting/protocol/input_event_tracker_unittest.cc

Issue 1403583003: Use standard DOM code definitions instead of custom. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Reviewer feedback. Created 5 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/protocol/input_event_tracker.cc ('k') | remoting/protocol/usb_key_codes.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/input_event_tracker_unittest.cc
diff --git a/remoting/protocol/input_event_tracker_unittest.cc b/remoting/protocol/input_event_tracker_unittest.cc
index 89f7a7279fb0df14097dd45b119ecc7ca0b45600..5a455ca6709d26b79ffdbf531c85c9c2e01fc1a1 100644
--- a/remoting/protocol/input_event_tracker_unittest.cc
+++ b/remoting/protocol/input_event_tracker_unittest.cc
@@ -142,9 +142,9 @@ TEST(InputEventTrackerTest, ReleaseAllKeys) {
input_tracker.InjectMouseEvent(NewMouseEvent(0, 0, BUTTON_LEFT, true));
input_tracker.InjectMouseEvent(NewMouseEvent(1, 1, BUTTON_LEFT, false));
- EXPECT_FALSE(input_tracker.IsKeyPressed(1));
- EXPECT_FALSE(input_tracker.IsKeyPressed(2));
- EXPECT_TRUE(input_tracker.IsKeyPressed(3));
+ EXPECT_FALSE(input_tracker.IsKeyPressed(static_cast<ui::DomCode>(1)));
+ EXPECT_FALSE(input_tracker.IsKeyPressed(static_cast<ui::DomCode>(2)));
+ EXPECT_TRUE(input_tracker.IsKeyPressed(static_cast<ui::DomCode>(3)));
EXPECT_EQ(1, input_tracker.PressedKeyCount());
input_tracker.ReleaseAll();
@@ -196,12 +196,12 @@ TEST(InputEventTrackerTest, TrackUsbKeyEvents) {
input_tracker.InjectKeyEvent(NewUsbEvent(5, true));
PressAndReleaseUsb(&input_tracker, 2);
- EXPECT_FALSE(input_tracker.IsKeyPressed(1));
- EXPECT_FALSE(input_tracker.IsKeyPressed(2));
- EXPECT_TRUE(input_tracker.IsKeyPressed(3));
- EXPECT_TRUE(input_tracker.IsKeyPressed(5));
- EXPECT_TRUE(input_tracker.IsKeyPressed(6));
- EXPECT_TRUE(input_tracker.IsKeyPressed(7));
+ EXPECT_FALSE(input_tracker.IsKeyPressed(static_cast<ui::DomCode>(1)));
+ EXPECT_FALSE(input_tracker.IsKeyPressed(static_cast<ui::DomCode>(2)));
+ EXPECT_TRUE(input_tracker.IsKeyPressed(static_cast<ui::DomCode>(3)));
+ EXPECT_TRUE(input_tracker.IsKeyPressed(static_cast<ui::DomCode>(5)));
+ EXPECT_TRUE(input_tracker.IsKeyPressed(static_cast<ui::DomCode>(6)));
+ EXPECT_TRUE(input_tracker.IsKeyPressed(static_cast<ui::DomCode>(7)));
EXPECT_EQ(4, input_tracker.PressedKeyCount());
input_tracker.ReleaseAll();
@@ -246,9 +246,9 @@ TEST(InputEventTrackerTest, InvalidEventsNotTracked) {
PressAndReleaseUsb(&input_tracker, 2);
- EXPECT_FALSE(input_tracker.IsKeyPressed(1));
- EXPECT_FALSE(input_tracker.IsKeyPressed(2));
- EXPECT_TRUE(input_tracker.IsKeyPressed(3));
+ EXPECT_FALSE(input_tracker.IsKeyPressed(static_cast<ui::DomCode>(1)));
+ EXPECT_FALSE(input_tracker.IsKeyPressed(static_cast<ui::DomCode>(2)));
+ EXPECT_TRUE(input_tracker.IsKeyPressed(static_cast<ui::DomCode>(3)));
EXPECT_EQ(1, input_tracker.PressedKeyCount());
input_tracker.ReleaseAll();
« no previous file with comments | « remoting/protocol/input_event_tracker.cc ('k') | remoting/protocol/usb_key_codes.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698