ozone: Rename XKeyboard to KeyboardController & use fake under ozone

chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc

Index: chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc
diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc b/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc
index 3f3f21219840f01dc967f21b3dada494a853c662..3f4ff2c49138f6652523bd0969bd1c886795f9de 100644
--- a/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc
+++ b/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc
@@ -20,7 +20,7 @@
 #include "chrome/browser/chromeos/input_method/mock_input_method_engine.h"
 #include "chromeos/ime/extension_ime_util.h"
 #include "chromeos/ime/fake_input_method_delegate.h"
-#include "chromeos/ime/fake_xkeyboard.h"
+#include "chromeos/ime/fake_keyboard_controller.h"
 #include "chromeos/ime/mock_component_extension_ime_manager_delegate.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/accelerators/accelerator.h"
@@ -80,8 +80,8 @@ class InputMethodManagerImplTest :  public testing::Test {
     candidate_window_controller_ = new MockCandidateWindowController;
     manager_->SetCandidateWindowControllerForTesting(
         candidate_window_controller_);
-    xkeyboard_ = new FakeXKeyboard;
-    manager_->SetXKeyboardForTesting(xkeyboard_);
+    xkeyboard_ = new FakeKeyboardController;
+    manager_->SetKeyboardControllerForTesting(xkeyboard_);
     mock_engine_handler_.reset(new MockIMEEngineHandler());
     IMEBridge::Initialize();
     IMEBridge::Get()->SetCurrentEngineHandler(mock_engine_handler_.get());
@@ -244,7 +244,7 @@ class InputMethodManagerImplTest :  public testing::Test {
   FakeInputMethodDelegate* delegate_;
   MockCandidateWindowController* candidate_window_controller_;
   scoped_ptr<MockIMEEngineHandler> mock_engine_handler_;
-  FakeXKeyboard* xkeyboard_;
+  FakeKeyboardController* xkeyboard_;
   base::MessageLoop message_loop_;
   MockComponentExtIMEManagerDelegate* mock_delegate_;
   std::vector<ComponentExtensionIME> ime_list_;
@@ -306,9 +306,9 @@ class TestCandidateWindowObserver
 };
 }  // namespace
 
-TEST_F(InputMethodManagerImplTest, TestGetXKeyboard) {
-  EXPECT_TRUE(manager_->GetXKeyboard());
-  EXPECT_EQ(xkeyboard_, manager_->GetXKeyboard());
+TEST_F(InputMethodManagerImplTest, TestGetKeyboardController) {
+  EXPECT_TRUE(manager_->GetKeyboardController());
+  EXPECT_EQ(xkeyboard_, manager_->GetKeyboardController());
 }
 
 TEST_F(InputMethodManagerImplTest, TestCandidateWindowObserver) {