Revert 173477

chrome/browser/chromeos/input_method/xkeyboard.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_XKEYBOARD_H_
 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_XKEYBOARD_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/memory/ref_counted.h"
-
-namespace base {
-class SequencedTaskRunner;
-}  // namespace base
 
 namespace chromeos {
 namespace input_method {
 
 struct AutoRepeatRate {
   AutoRepeatRate() : initial_delay_in_ms(0), repeat_interval_in_ms(0) {}
   unsigned int initial_delay_in_ms;
   unsigned int repeat_interval_in_ms;
 };
 
@@ skipping 70 matching lines @@
   virtual unsigned int GetNumLockMask() = 0;
 
   // Set true on |out_caps_lock_enabled| if Caps Lock is enabled. Set true on
   // |out_num_lock_enabled| if Num Lock is enabled. Both out parameters can be
   // NULL. Do not call the function from non-UI threads.
   virtual void GetLockedModifiers(bool* out_caps_lock_enabled,
                                   bool* out_num_lock_enabled) = 0;
 
   // Turns on and off the auto-repeat of the keyboard. Returns true on success.
   // Do not call the function from non-UI threads.
-  virtual bool SetAutoRepeatEnabled(bool enabled) = 0;
+  // TODO(yusukes): Make this function non-static so we can mock it.
+  static bool SetAutoRepeatEnabled(bool enabled);
 
   // Sets the auto-repeat rate of the keyboard, initial delay in ms, and repeat
   // interval in ms.  Returns true on success. Do not call the function from
   // non-UI threads.
-  virtual bool SetAutoRepeatRate(const AutoRepeatRate& rate) = 0;
+  // TODO(yusukes): Make this function non-static so we can mock it.
+  static bool SetAutoRepeatRate(const AutoRepeatRate& rate);
 
-  // Returns true if auto repeat is enabled.
+  // Returns true if auto repeat is enabled. This function is protected: for
+  // testability.
   static bool GetAutoRepeatEnabledForTesting();
 
   // On success, set current auto repeat rate on |out_rate| and returns true.
-  // Returns false otherwise.
+  // Returns false otherwise. This function is protected: for testability.
   static bool GetAutoRepeatRateForTesting(AutoRepeatRate* out_rate);
 
   // Returns false if |layout_name| contains a bad character.
   static bool CheckLayoutNameForTesting(const std::string& layout_name);
 
-  // Creates an instance of XKeyboard. |default_task_runner| is used to verify
-  // thread-safe usage (all methods must be invoked in the context of
-  // default_task_runner).
   // Note: At this moment, classes other than InputMethodManager should not
   // instantiate the XKeyboard class.
-  static XKeyboard* Create(
-      const InputMethodUtil& util,
-      const scoped_refptr<base::SequencedTaskRunner>& default_task_runner);
+  static XKeyboard* Create(const InputMethodUtil& util);
 };
 
 }  // namespace input_method
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_XKEYBOARD_H_