ozone: Rename XKeyboard to KeyboardController & use fake under ozone

chrome/browser/chromeos/input_method/mock_input_method_manager.h

Index: chrome/browser/chromeos/input_method/mock_input_method_manager.h
diff --git a/chrome/browser/chromeos/input_method/mock_input_method_manager.h b/chrome/browser/chromeos/input_method/mock_input_method_manager.h
index 3f9c60017ce7c61411b2e2f252c3bfb8ecbcba69..4e42ede54c56efdca620b078df3a29f22f172e0d 100644
--- a/chrome/browser/chromeos/input_method/mock_input_method_manager.h
+++ b/chrome/browser/chromeos/input_method/mock_input_method_manager.h
@@ -7,7 +7,7 @@
 
 #include "chrome/browser/chromeos/input_method/input_method_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/input_method_manager.h"
 #include "chromeos/ime/input_method_whitelist.h"
 
@@ -60,7 +60,7 @@ class MockInputMethodManager : public InputMethodManager {
   virtual InputMethodDescriptor GetCurrentInputMethod() const OVERRIDE;
   virtual bool IsISOLevel5ShiftUsedByCurrentInputMethod() const OVERRIDE;
   virtual bool IsAltGrUsedByCurrentInputMethod() const OVERRIDE;
-  virtual XKeyboard* GetXKeyboard() OVERRIDE;
+  virtual KeyboardController* GetKeyboardController() OVERRIDE;
   virtual InputMethodUtil* GetInputMethodUtil() OVERRIDE;
   virtual ComponentExtensionIMEManager*
       GetComponentExtensionIMEManager() OVERRIDE;
@@ -90,7 +90,7 @@ class MockInputMethodManager : public InputMethodManager {
   InputMethodWhitelist whitelist_;
   FakeInputMethodDelegate delegate_;  // used by util_
   InputMethodUtil util_;
-  FakeXKeyboard xkeyboard_;
+  FakeKeyboardController xkeyboard_;
   bool mod3_used_;
 
   // The active input method ids cache (actually default only)