Commit 77346ccd authored by yusukes@google.com's avatar yusukes@google.com

cleanup: Use MockXKeyboard in caps_lock_handler_browsertest.cc.

BUG=None
TEST=ran the browser test.

Review URL: https://chromiumcodereview.appspot.com/10080002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132505 0039d316-1c4b-4281-b951-d872f2087c98
parent 1ea3c791
...@@ -7,66 +7,17 @@ ...@@ -7,66 +7,17 @@
#include "chrome/test/base/ui_test_utils.h" #include "chrome/test/base/ui_test_utils.h"
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/input_method/xkeyboard.h" #include "chrome/browser/chromeos/input_method/mock_xkeyboard.h"
using namespace chromeos::input_method; using namespace chromeos::input_method;
#endif #endif
namespace { namespace {
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
class DummyXKeyboard : public XKeyboard {
public:
explicit DummyXKeyboard(bool initial_caps_lock_state)
: caps_lock_is_enabled_(initial_caps_lock_state) {}
virtual ~DummyXKeyboard() {}
// Overridden from chrome::input_method::XKeyboard:
virtual bool SetCurrentKeyboardLayoutByName(
const std::string& layout_name) OVERRIDE {
return true;
}
virtual bool RemapModifierKeys(const ModifierMap& modifier_map) OVERRIDE {
return true;
}
virtual bool ReapplyCurrentKeyboardLayout() OVERRIDE {
return true;
}
virtual void ReapplyCurrentModifierLockStatus() OVERRIDE {}
virtual void SetLockedModifiers(
ModifierLockStatus new_caps_lock_status,
ModifierLockStatus new_num_lock_status) OVERRIDE {}
virtual void SetNumLockEnabled(bool enable_num_lock) OVERRIDE {}
virtual void SetCapsLockEnabled(bool enable_caps_lock) OVERRIDE {
caps_lock_is_enabled_ = enable_caps_lock;
}
virtual bool NumLockIsEnabled() OVERRIDE {
return true;
}
virtual bool CapsLockIsEnabled() OVERRIDE {
return caps_lock_is_enabled_;
}
virtual std::string CreateFullXkbLayoutName(
const std::string& layout_name,
const ModifierMap& modifire_map) OVERRIDE {
return "";
}
virtual unsigned int GetNumLockMask() OVERRIDE {
return 0;
}
virtual void GetLockedModifiers(bool* out_caps_lock_enabled,
bool* out_num_lock_enabled) OVERRIDE {}
private:
bool caps_lock_is_enabled_;
DISALLOW_COPY_AND_ASSIGN(DummyXKeyboard);
};
class CapsLockHandlerTest : public InProcessBrowserTest { class CapsLockHandlerTest : public InProcessBrowserTest {
public: public:
CapsLockHandlerTest() CapsLockHandlerTest()
: initial_caps_lock_state_(false), : initial_caps_lock_state_(false) {
xkeyboard_(initial_caps_lock_state_) {
} }
virtual void SetUp() OVERRIDE { virtual void SetUp() OVERRIDE {
handler_.reset(new CapsLockHandler(&xkeyboard_)); handler_.reset(new CapsLockHandler(&xkeyboard_));
...@@ -79,7 +30,7 @@ class CapsLockHandlerTest : public InProcessBrowserTest { ...@@ -79,7 +30,7 @@ class CapsLockHandlerTest : public InProcessBrowserTest {
protected: protected:
const bool initial_caps_lock_state_; const bool initial_caps_lock_state_;
DummyXKeyboard xkeyboard_; MockXKeyboard xkeyboard_;
scoped_ptr<CapsLockHandler> handler_; scoped_ptr<CapsLockHandler> handler_;
DISALLOW_COPY_AND_ASSIGN(CapsLockHandlerTest); DISALLOW_COPY_AND_ASSIGN(CapsLockHandlerTest);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment