summaryrefslogtreecommitdiffstats
path: root/ui/base
diff options
context:
space:
mode:
authorkevers@chromium.org <kevers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-15 17:32:38 +0000
committerkevers@chromium.org <kevers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-15 17:32:38 +0000
commit4a1573365a4a166ef8baf3ecfe9e55c40b10c4b8 (patch)
treea8a3439bf100f7e3a2c18d6c5b4cd2eb598a349f /ui/base
parent670b51497ef411ce9da6931c1596508e007c28f1 (diff)
downloadchromium_src-4a1573365a4a166ef8baf3ecfe9e55c40b10c4b8.zip
chromium_src-4a1573365a4a166ef8baf3ecfe9e55c40b10c4b8.tar.gz
chromium_src-4a1573365a4a166ef8baf3ecfe9e55c40b10c4b8.tar.bz2
Fix keyboard_unittests
BUG=331690 R=penghuang@chromium.org Review URL: https://codereview.chromium.org/136033005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244919 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base')
-rw-r--r--ui/base/ime/input_method_factory.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/ui/base/ime/input_method_factory.cc b/ui/base/ime/input_method_factory.cc
index 0f000f6..e79e563 100644
--- a/ui/base/ime/input_method_factory.cc
+++ b/ui/base/ime/input_method_factory.cc
@@ -58,6 +58,9 @@ scoped_ptr<InputMethod> CreateInputMethod(
}
void SetUpInputMethodFactoryForTesting() {
+ if (g_input_method_set_for_testing)
+ return;
+
CHECK(!g_create_input_method_called)
<< "ui::SetUpInputMethodFactoryForTesting was called after use of "
<< "ui::CreateInputMethod. You must call "