ozone: Rename XKeyboard to KeyboardController & use fake under ozone

chromeos/chromeos.gyp

Index: chromeos/chromeos.gyp
diff --git a/chromeos/chromeos.gyp b/chromeos/chromeos.gyp
index f464994a5bf95641d4c7ceca6c75bb09eb5b1533..4c39ccc14398c6fb234e7fffb5c674aaf8a17278 100644
--- a/chromeos/chromeos.gyp
+++ b/chromeos/chromeos.gyp
@@ -231,8 +231,8 @@
         'ime/component_extension_ime_manager.h',
         'ime/extension_ime_util.cc',
         'ime/extension_ime_util.h',
-        'ime/fake_xkeyboard.cc',
-        'ime/fake_xkeyboard.h',
+        'ime/fake_keyboard_controller.cc',
+        'ime/fake_keyboard_controller.h',
         'ime/composition_text.cc',
         'ime/composition_text.h',
         'ime/input_method_delegate.h',
@@ -242,8 +242,9 @@
         'ime/input_method_manager.h',
         'ime/input_method_whitelist.cc',
         'ime/input_method_whitelist.h',
-        'ime/xkeyboard.cc',
-        'ime/xkeyboard.h',
+        'ime/keyboard_controller.h',
+        'ime/keyboard_controller_ozone.cc',
+        'ime/keyboard_controller_x11.cc',
         'login/login_state.cc',
         'login/login_state.h',
         'network/certificate_pattern.cc',
@@ -362,8 +363,8 @@
         }, {
           # use_x11 == 0
           'sources!': [
-            'ime/xkeyboard.cc',
-            'ime/xkeyboard.h',
+            'ime/keyboard_controller.cc',
+            'ime/keyboard_controller.h',
           ],
         }],
       ],
@@ -493,7 +494,7 @@
         'ime/composition_text_unittest.cc',
         'ime/input_method_manager.h',
         'ime/input_method_whitelist_unittest.cc',
-        'ime/xkeyboard_unittest.cc',
+        'ime/keyboard_controller_unittest.cc',
         'login/login_state_unittest.cc',
         'network/client_cert_resolver_unittest.cc',
         'network/geolocation_handler_unittest.cc',