Revert 173477

chrome/browser/chromeos/input_method/xkeyboard_unittest.cc

 // 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.
 
 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #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 {
 
 namespace {
 
 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() {
     xkey_.reset();
   }
 
   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.
 bool DisplayAvailable() {
   return ui::GetXDisplay() ? true : false;
 }
 
 }  // namespace
 
 // Tests CheckLayoutName() function.
@@ skipping 120 matching lines @@
   // No-op GetLockedModifiers call. Confirm it does not crash.
   xkey_->GetLockedModifiers(NULL, NULL);
 }
 
 TEST_F(XKeyboardTest, TestSetAutoRepeatEnabled) {
   if (!DisplayAvailable()) {
     DVLOG(1) << "X server is not available. Skip the test.";
     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());
 }
 
 TEST_F(XKeyboardTest, TestSetAutoRepeatRate) {
   if (!DisplayAvailable()) {
     DVLOG(1) << "X server is not available. Skip the test.";
     return;
   }
   AutoRepeatRate rate;
   EXPECT_TRUE(XKeyboard::GetAutoRepeatRateForTesting(&rate));
 
   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);
 }
 
 }  // namespace input_method
 }  // namespace chromeos