Rename KEY_ constants to avoid conflict with <linux/input.h>

Most |enum class DomCode| constants are named by mapping the names from
the W3C specification from CamelCase to SHOUTY_CASE. For the Latin
letters, named 'KeyX' in the spec, the KEY_X form conflicts with macro
definitions in <linux/input.h>. This change renames DomCode::KEY_X
constants to DomCode::US_X to avoid the conflict and to highlight
that these are positional codes corresponding to the labels
on a US QWERTY layout.

(TBR for 15 files with only spelling changes.)

R=wez@chromium.org
TBR=ben@chromium.org

Review URL: https://codereview.chromium.org/1560293002

Cr-Commit-Position: refs/heads/master@{#368075}

1 files changed, 24 insertions, 24 deletions

diff --git a/remoting/client/normalizing_input_filter_mac_unittest.cc b/remoting/client/normalizing_input_filter_mac_unittest.cc
index 9c637e5..ce5ff53 100644
--- a/remoting/client/normalizing_input_filter_mac_unittest.cc
+++ b/remoting/client/normalizing_input_filter_mac_unittest.cc
@@ -64,14 +64,14 @@ TEST(NormalizingInputFilterMacTest, NoInjection) {
     InSequence s;
 
     EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
-        ui::DomCode::KEY_C, true)));
+        ui::DomCode::US_C, true)));
     EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
-        ui::DomCode::KEY_C, false)));
+        ui::DomCode::US_C, false)));
   }
 
   // C Down and C Up.
-  processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::KEY_C, true));
-  processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::KEY_C, false));
+  processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::US_C, true));
+  processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::US_C, false));
 }
 
 // Test pressing command key and other normal keys.
@@ -87,9 +87,9 @@ TEST(NormalizingInputFilterMacTest, CmdKey) {
     EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
         ui::DomCode::OS_LEFT, true)));
     EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
-        ui::DomCode::KEY_C, true)));
+        ui::DomCode::US_C, true)));
     EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
-        ui::DomCode::KEY_C, false)));
+        ui::DomCode::US_C, false)));
     EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
         ui::DomCode::OS_LEFT, false)));
 
@@ -97,9 +97,9 @@ TEST(NormalizingInputFilterMacTest, CmdKey) {
     EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
         ui::DomCode::OS_RIGHT, true)));
     EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
-        ui::DomCode::KEY_C, true)));
+        ui::DomCode::US_C, true)));
     EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
-        ui::DomCode::KEY_C, false)));
+        ui::DomCode::US_C, false)));
     EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
         ui::DomCode::OS_RIGHT, false)));
 
@@ -107,31 +107,31 @@ TEST(NormalizingInputFilterMacTest, CmdKey) {
     EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
         ui::DomCode::OS_RIGHT, true)));
     EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
-        ui::DomCode::KEY_C, true)));
+        ui::DomCode::US_C, true)));
     EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
-        ui::DomCode::KEY_V, true)));
+        ui::DomCode::US_V, true)));
     EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
-        ui::DomCode::KEY_C, false)));
+        ui::DomCode::US_C, false)));
     EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
-        ui::DomCode::KEY_V, false)));
+        ui::DomCode::US_V, false)));
     EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
         ui::DomCode::OS_RIGHT, false)));
   }
 
   // Left command key.
   processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::OS_LEFT, true));
-  processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::KEY_C, true));
+  processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::US_C, true));
   processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::OS_LEFT, false));
 
   // Right command key.
   processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::OS_RIGHT, true));
-  processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::KEY_C, true));
+  processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::US_C, true));
   processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::OS_RIGHT, false));
 
   // More than one keys after CMD.
   processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::OS_RIGHT, true));
-  processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::KEY_C, true));
-  processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::KEY_V, true));
+  processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::US_C, true));
+  processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::US_V, true));
   processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::OS_RIGHT, false));
 }
 
@@ -190,11 +190,11 @@ TEST(NormalizingInputFilterMacTest, MultipleCmdKeys) {
     EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
         ui::DomCode::OS_LEFT, true)));
     EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
-        ui::DomCode::KEY_C, true)));
+        ui::DomCode::US_C, true)));
     EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
         ui::DomCode::OS_RIGHT, true)));
     EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
-        ui::DomCode::KEY_C, false)));
+        ui::DomCode::US_C, false)));
     EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
         ui::DomCode::OS_LEFT, false)));
   }
@@ -202,7 +202,7 @@ TEST(NormalizingInputFilterMacTest, MultipleCmdKeys) {
   // Test multiple CMD keys at the same time.
   // L CMD Down, C Down, R CMD Down, L CMD Up.
   processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::OS_LEFT, true));
-  processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::KEY_C, true));
+  processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::US_C, true));
   processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::OS_RIGHT, true));
   processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::OS_LEFT, false));
 }
@@ -217,22 +217,22 @@ TEST(NormalizingInputFilterMacTest, BeforeCmdKey) {
     InSequence s;
 
     EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
-        ui::DomCode::KEY_C, true)));
+        ui::DomCode::US_C, true)));
     EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
         ui::DomCode::OS_RIGHT, true)));
     EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
-        ui::DomCode::KEY_C, false)));
+        ui::DomCode::US_C, false)));
     EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
         ui::DomCode::OS_RIGHT, false)));
     EXPECT_CALL(stub, InjectKeyEvent(EqualsKeyEventWithNumLock(
-        ui::DomCode::KEY_C, false)));
+        ui::DomCode::US_C, false)));
   }
 
   // Press C before command key.
-  processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::KEY_C, true));
+  processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::US_C, true));
   processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::OS_RIGHT, true));
   processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::OS_RIGHT, false));
-  processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::KEY_C, false));
+  processor->InjectKeyEvent(MakeKeyEvent(ui::DomCode::US_C, false));
 }
 
 }  // namespace remoting