1 files changed, 12 insertions, 8 deletions
diff --git a/chrome/browser/chromeos/input_method/xkeyboard_unittest.cc b/chrome/browser/chromeos/input_method/xkeyboard_unittest.cc
index 250830a..ab3cc3a 100644
--- a/chrome/browser/chromeos/input_method/xkeyboard_unittest.cc
+++ b/chrome/browser/chromeos/input_method/xkeyboard_unittest.cc
@@ -14,12 +14,14 @@
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chrome/browser/chromeos/input_method/input_method_whitelist.h"
 #include "chrome/browser/chromeos/input_method/mock_input_method_delegate.h"
-#include "chrome/browser/chromeos/input_method/mock_sequenced_task_runner.h"
+#include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/x/x11_util.h"
 
 #include <X11/Xlib.h>
 
+using content::BrowserThread;
+
 namespace chromeos {
 namespace input_method {
 
@@ -29,11 +31,11 @@ class XKeyboardTest : public testing::Test {
  public:
   XKeyboardTest()
       : util_(&delegate_, whitelist_.GetSupportedInputMethods()),
-        mock_task_runner_(new MockSequencedTaskRunner) {
+        ui_thread_(BrowserThread::UI, &message_loop_) {
   }
 
   virtual void SetUp() {
-    xkey_.reset(XKeyboard::Create(util_, mock_task_runner_));
+    xkey_.reset(XKeyboard::Create(util_));
   }
 
   virtual void TearDown() {
@@ -43,8 +45,10 @@ class XKeyboardTest : public testing::Test {
   MockInputMethodDelegate delegate_;
   InputMethodWhitelist whitelist_;
   InputMethodUtil util_;
-  scoped_refptr<MockSequencedTaskRunner> mock_task_runner_;
   scoped_ptr<XKeyboard> xkey_;
+
+  MessageLoopForUI message_loop_;
+  content::TestBrowserThread ui_thread_;
 };
 
 // Returns true if X display is available.
@@ -185,10 +189,10 @@ TEST_F(XKeyboardTest, TestSetAutoRepeatEnabled) {
     return;
   }
   const bool state = XKeyboard::GetAutoRepeatEnabledForTesting();
-  xkey_->SetAutoRepeatEnabled(!state);
+  XKeyboard::SetAutoRepeatEnabled(!state);
   EXPECT_EQ(!state, XKeyboard::GetAutoRepeatEnabledForTesting());
   // Restore the initial state.
-  xkey_->SetAutoRepeatEnabled(state);
+  XKeyboard::SetAutoRepeatEnabled(state);
   EXPECT_EQ(state, XKeyboard::GetAutoRepeatEnabledForTesting());
 }
 
@@ -203,13 +207,13 @@ TEST_F(XKeyboardTest, TestSetAutoRepeatRate) {
   AutoRepeatRate tmp(rate);
   ++tmp.initial_delay_in_ms;
   ++tmp.repeat_interval_in_ms;
-  EXPECT_TRUE(xkey_->SetAutoRepeatRate(tmp));
+  EXPECT_TRUE(XKeyboard::SetAutoRepeatRate(tmp));
   EXPECT_TRUE(XKeyboard::GetAutoRepeatRateForTesting(&tmp));
   EXPECT_EQ(rate.initial_delay_in_ms + 1, tmp.initial_delay_in_ms);
   EXPECT_EQ(rate.repeat_interval_in_ms + 1, tmp.repeat_interval_in_ms);
 
   // Restore the initial state.
-  EXPECT_TRUE(xkey_->SetAutoRepeatRate(rate));
+  EXPECT_TRUE(XKeyboard::SetAutoRepeatRate(rate));
   EXPECT_TRUE(XKeyboard::GetAutoRepeatRateForTesting(&tmp));
   EXPECT_EQ(rate.initial_delay_in_ms, tmp.initial_delay_in_ms);
   EXPECT_EQ(rate.repeat_interval_in_ms, tmp.repeat_interval_in_ms);