ozone: Rename XKeyboard to KeyboardController & use fake under ozone

chrome/browser/chromeos/input_method/input_method_manager_impl.cc

Index: chrome/browser/chromeos/input_method/input_method_manager_impl.cc
diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl.cc b/chrome/browser/chromeos/input_method/input_method_manager_impl.cc
index 45588b63a0c4cae807c17b481e75084afec23a73..28ac69bb1e7196e505ac43354d87f9e638278c9c 100644
--- a/chrome/browser/chromeos/input_method/input_method_manager_impl.cc
+++ b/chrome/browser/chromeos/input_method/input_method_manager_impl.cc
@@ -23,9 +23,9 @@
 #include "chrome/browser/chromeos/language_preferences.h"
 #include "chromeos/ime/component_extension_ime_manager.h"
 #include "chromeos/ime/extension_ime_util.h"
-#include "chromeos/ime/fake_xkeyboard.h"
+#include "chromeos/ime/fake_keyboard_controller.h"
 #include "chromeos/ime/input_method_delegate.h"
-#include "chromeos/ime/xkeyboard.h"
+#include "chromeos/ime/keyboard_controller.h"
 #include "third_party/icu/source/common/unicode/uloc.h"
 #include "ui/base/accelerators/accelerator.h"
 
@@ -723,7 +723,7 @@ bool InputMethodManagerImpl::IsAltGrUsedByCurrentInputMethod() const {
   return xkeyboard_->IsAltGrAvailable();
 }
 
-XKeyboard* InputMethodManagerImpl::GetXKeyboard() {
+KeyboardController* InputMethodManagerImpl::GetKeyboardController() {
   return xkeyboard_.get();
 }
 
@@ -751,9 +751,9 @@ void InputMethodManagerImpl::Init(base::SequencedTaskRunner* ui_task_runner) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (base::SysInfo::IsRunningOnChromeOS())
-    xkeyboard_.reset(XKeyboard::Create());
+    xkeyboard_.reset(KeyboardController::Create());
   else
-    xkeyboard_.reset(new FakeXKeyboard());
+    xkeyboard_.reset(new FakeKeyboardController());
 
   // We can't call impl->Initialize here, because file thread is not available
   // at this moment.
@@ -769,7 +769,8 @@ void InputMethodManagerImpl::SetCandidateWindowControllerForTesting(
   candidate_window_controller_->AddObserver(this);
 }
 
-void InputMethodManagerImpl::SetXKeyboardForTesting(XKeyboard* xkeyboard) {
+void InputMethodManagerImpl::SetKeyboardControllerForTesting(
+    KeyboardController* xkeyboard) {
   xkeyboard_.reset(xkeyboard);
 }