[Android DomKey] Swap mapping for TVInputComposite and TVInputComponent

ui/events/keycodes/keyboard_code_conversion_android.cc

Index: ui/events/keycodes/keyboard_code_conversion_android.cc
diff --git a/ui/events/keycodes/keyboard_code_conversion_android.cc b/ui/events/keycodes/keyboard_code_conversion_android.cc
index f20e0737e271dbb142066730f10924b196578eda..5baef1990a9870a5a0f5e675f3819dbf7508500e 100644
--- a/ui/events/keycodes/keyboard_code_conversion_android.cc
+++ b/ui/events/keycodes/keyboard_code_conversion_android.cc
@@ -334,13 +334,13 @@ DomKey GetDomKeyFromAndroidKeycode(int keycode) {
     case AKEYCODE_TV_INPUT_HDMI_4:
       return DomKey::TV_INPUT_HDMI4;
     case AKEYCODE_TV_INPUT_COMPOSITE_1:
-      return DomKey::TV_INPUT_COMPONENT1;
+      return DomKey::TV_INPUT_COMPOSITE1;
     case AKEYCODE_TV_INPUT_COMPOSITE_2:
-      return DomKey::TV_INPUT_COMPONENT2;
+      return DomKey::TV_INPUT_COMPOSITE2;
     case AKEYCODE_TV_INPUT_COMPONENT_1:

[garykac, 2017/01/10 21:33:25]

Could you fix these to be in alphabetical order?

[chongz, 2017/01/10 22:21:36]

It seems to me that this table is in AKEYCODE value order, e.g.
```
AKEYCODE_TV_INPUT_HDMI_4 = 246
AKEYCODE_TV_INPUT_COMPOSITE_1 = 247
AKEYCODE_TV_INPUT_COMPOSITE_2 = 248
AKEYCODE_TV_INPUT_COMPONENT_1 = 249
AKEYCODE_TV_INPUT_COMPONENT_2 = 250
AKEYCODE_TV_INPUT_VGA_1 = 251
AKEYCODE_TV_AUDIO_DESCRIPTION = 252
```

Or do you want me to reorder the whole table?

-      return DomKey::TV_INPUT_COMPOSITE1;
+      return DomKey::TV_INPUT_COMPONENT1;
     case AKEYCODE_TV_INPUT_COMPONENT_2:
-      return DomKey::TV_INPUT_COMPOSITE2;
+      return DomKey::TV_INPUT_COMPONENT2;
     case AKEYCODE_TV_INPUT_VGA_1:
       return DomKey::TV_INPUT_VGA1;
     case AKEYCODE_TV_AUDIO_DESCRIPTION: