ozone: Rename XKeyboard to KeyboardController & use fake under ozone

chrome/browser/chromeos/preferences_browsertest.cc

 // Copyright 2014 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.
 
 #include <sys/types.h>
 
 #include "ash/shell.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager_impl.h"
 #include "chrome/browser/chromeos/login/login_manager_test.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/user_adding_screen.h"
 #include "chrome/browser/chromeos/preferences.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h"
 #include "chrome/browser/chromeos/system/fake_input_device_settings.h"
 #include "chrome/browser/feedback/tracing_manager.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/chromeos_switches.h"
-#include "chromeos/ime/fake_xkeyboard.h"
+#include "chromeos/ime/fake_keyboard_controller.h"
 #include "content/public/test/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event_utils.h"
 
 namespace chromeos {
 
 namespace {
 
 const char* kTestUsers[] = {"test-user1@gmail.com", "test-user2@gmail.com"};
 
 }  // namespace
 
 class PreferencesTest : public LoginManagerTest {
  public:
   PreferencesTest()
       : LoginManagerTest(true),
         input_settings_(NULL),
         xkeyboard_(NULL) {}
 
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     LoginManagerTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(::switches::kMultiProfiles);
     command_line->AppendSwitch(switches::kStubCrosSettings);
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {
     LoginManagerTest::SetUpOnMainThread();
     input_settings_ = new system::FakeInputDeviceSettings();
     system::InputDeviceSettings::SetSettingsForTesting(input_settings_);
-    xkeyboard_ = new input_method::FakeXKeyboard();
+    xkeyboard_ = new input_method::FakeKeyboardController();
     static_cast<input_method::InputMethodManagerImpl*>(
         input_method::InputMethodManager::Get())
-        ->SetXKeyboardForTesting(xkeyboard_);
+        ->SetKeyboardControllerForTesting(xkeyboard_);
     CrosSettings::Get()->SetString(kDeviceOwner, kTestUsers[0]);
   }
 
   // Sets set of preferences in given |prefs|. Value of prefernece depends of
   // |variant| value. For opposite |variant| values all preferences recieve
   // different values.
   void SetPrefs(PrefService* prefs, bool variant) {
     prefs->SetBoolean(prefs::kTapToClickEnabled, variant);
     prefs->SetBoolean(prefs::kPrimaryMouseButtonRight, !variant);
     prefs->SetBoolean(prefs::kTapDraggingEnabled, variant);
@@ skipping 44 matching lines @@
   void CheckLocalStateCorrespondsToPrefs(PrefService* prefs) {
     PrefService* local_state = g_browser_process->local_state();
     EXPECT_EQ(local_state->GetBoolean(prefs::kOwnerTapToClickEnabled),
               prefs->GetBoolean(prefs::kTapToClickEnabled));
     EXPECT_EQ(local_state->GetBoolean(prefs::kOwnerPrimaryMouseButtonRight),
               prefs->GetBoolean(prefs::kPrimaryMouseButtonRight));
   }
 
  private:
   system::FakeInputDeviceSettings* input_settings_;
-  input_method::FakeXKeyboard* xkeyboard_;
+  input_method::FakeKeyboardController* xkeyboard_;
 
   DISALLOW_COPY_AND_ASSIGN(PreferencesTest);
 };
 
 IN_PROC_BROWSER_TEST_F(PreferencesTest, PRE_MultiProfiles) {
   RegisterUser(kTestUsers[0]);
   RegisterUser(kTestUsers[1]);
   chromeos::StartupUtils::MarkOobeCompleted();
 }
 
@@ skipping 59 matching lines @@
                      !prefs1->GetBoolean(prefs::kTapToClickEnabled));
   CheckLocalStateCorrespondsToPrefs(prefs1);
 
   // Switch user back.
   user_manager->SwitchActiveUser(kTestUsers[0]);
   CheckSettingsCorrespondToPrefs(prefs1);
   CheckLocalStateCorrespondsToPrefs(prefs1);
 }
 
 }  // namespace chromeos