ozone: Rename XKeyboard to KeyboardController & use fake under ozone

chrome/browser/chromeos/input_method/mock_input_method_manager.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_MOCK_INPUT_METHOD_MANAGER_H_
 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_MOCK_INPUT_METHOD_MANAGER_H_
 
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chromeos/ime/component_extension_ime_manager.h"
+#include "chromeos/ime/fake_ime_keyboard.h"
 #include "chromeos/ime/fake_input_method_delegate.h"
-#include "chromeos/ime/fake_xkeyboard.h"
 #include "chromeos/ime/input_method_manager.h"
 #include "chromeos/ime/input_method_whitelist.h"
 
 namespace chromeos {
 namespace input_method {
 
 // The mock implementation of InputMethodManager for testing.
 class MockInputMethodManager : public InputMethodManager {
  public:
   MockInputMethodManager();
@@ skipping 32 matching lines @@
       InputMethodDescriptors* result) OVERRIDE;
   virtual void SetEnabledExtensionImes(std::vector<std::string>* ids) OVERRIDE;
   virtual void SetInputMethodLoginDefault() OVERRIDE;
   virtual bool SwitchToNextInputMethod() OVERRIDE;
   virtual bool SwitchToPreviousInputMethod(
       const ui::Accelerator& accelerator) OVERRIDE;
   virtual bool SwitchInputMethod(const ui::Accelerator& accelerator) OVERRIDE;
   virtual InputMethodDescriptor GetCurrentInputMethod() const OVERRIDE;
   virtual bool IsISOLevel5ShiftUsedByCurrentInputMethod() const OVERRIDE;
   virtual bool IsAltGrUsedByCurrentInputMethod() const OVERRIDE;
-  virtual XKeyboard* GetXKeyboard() OVERRIDE;
+  virtual ImeKeyboard* GetImeKeyboard() OVERRIDE;
   virtual InputMethodUtil* GetInputMethodUtil() OVERRIDE;
   virtual ComponentExtensionIMEManager*
       GetComponentExtensionIMEManager() OVERRIDE;
   virtual bool IsLoginKeyboard(const std::string& layout) const OVERRIDE;
   virtual bool MigrateXkbInputMethods(
        std::vector<std::string>* input_method_ids) OVERRIDE;
 
   // Sets an input method ID which will be returned by GetCurrentInputMethod().
   void SetCurrentInputMethodId(const std::string& input_method_id) {
     current_input_method_id_ = input_method_id;
@@ skipping 12 matching lines @@
   int add_observer_count_;
   int remove_observer_count_;
 
  private:
   // The value GetCurrentInputMethod().id() will return.
   std::string current_input_method_id_;
 
   InputMethodWhitelist whitelist_;
   FakeInputMethodDelegate delegate_;  // used by util_
   InputMethodUtil util_;
-  FakeXKeyboard xkeyboard_;
+  FakeImeKeyboard keyboard_;
   bool mod3_used_;
   scoped_ptr<ComponentExtensionIMEManager> comp_ime_manager_;
 
   // The active input method ids cache (actually default only)
   std::vector<std::string> active_input_method_ids_;
 
   DISALLOW_COPY_AND_ASSIGN(MockInputMethodManager);
 };
 
 }  // namespace input_method
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_MOCK_INPUT_METHOD_MANAGER_H_