summaryrefslogtreecommitdiffstats
path: root/ui/aura/test
diff options
context:
space:
mode:
authornona@chromium.org <nona@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-31 11:48:20 +0000
committernona@chromium.org <nona@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-31 11:48:20 +0000
commite6c896f16eefb080ad483b144516a2919a4292bc (patch)
treebc037c1f769797e869c9ff8bb07798c1a308f100 /ui/aura/test
parentd3a652c574b9c1669d8f4ff0680d2ac15e153372 (diff)
downloadchromium_src-e6c896f16eefb080ad483b144516a2919a4292bc.zip
chromium_src-e6c896f16eefb080ad483b144516a2919a4292bc.tar.gz
chromium_src-e6c896f16eefb080ad483b144516a2919a4292bc.tar.bz2
Introduce TextInputTestSupport.
This CL is preparation for http://codereview.chromium.org/10388220. This CL does not affect current test contents or browser behaviors. This CL contains follows: 1. Add chromeos and dbus include rule into ui/DEPS To replace text inputting module from libibus to chrome dbus library, ui/base/ime/* should depend to chromeos/dbus/* and dbus/* 2. Introduce TextInputSupport for input testing. To use chorme library, should initialize DBusThreadManager before using DBusThreadManager instance. 3. Calls TextInputSupport::Initialize/Shutdown for some test. Some test uses text inputting module implicitly. So should call Initialize/Shutdown on SetUp/TearDown. BUG=126947 TEST=browser_tests,interactive_ui_tests,ui_unittests,aura_unittests,aura_shell_unittests,unit_tests,chromeos_unittests,dbus_unittets Review URL: https://chromiumcodereview.appspot.com/10447022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139775 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/test')
-rw-r--r--ui/aura/test/aura_test_base.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/ui/aura/test/aura_test_base.cc b/ui/aura/test/aura_test_base.cc
index e1fe5b8..b128cab 100644
--- a/ui/aura/test/aura_test_base.cc
+++ b/ui/aura/test/aura_test_base.cc
@@ -6,6 +6,7 @@
#include "ui/aura/test/aura_test_helper.h"
#include "ui/base/gestures/gesture_configuration.h"
+#include "ui/base/ime/text_input_test_support.h"
namespace aura {
namespace test {
@@ -18,6 +19,7 @@ AuraTestBase::~AuraTestBase() {
void AuraTestBase::SetUp() {
testing::Test::SetUp();
+ ui::TextInputTestSupport::Initilaize();
// Changing the parameters for gesture recognition shouldn't cause
// tests to fail, so we use a separate set of parameters for unit
@@ -49,6 +51,7 @@ void AuraTestBase::TearDown() {
RunAllPendingInMessageLoop();
helper_->TearDown();
+ ui::TextInputTestSupport::Shutdown();
testing::Test::TearDown();
}