diff options
| author | nona@chromium.org <nona@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-31 11:48:20 +0000 |
|---|---|---|
| committer | nona@chromium.org <nona@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-31 11:48:20 +0000 |
| commit | e6c896f16eefb080ad483b144516a2919a4292bc (patch) | |
| tree | bc037c1f769797e869c9ff8bb07798c1a308f100 /ui/ui_unittests.gypi | |
| parent | d3a652c574b9c1669d8f4ff0680d2ac15e153372 (diff) | |
| download | chromium_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/ui_unittests.gypi')
| -rw-r--r-- | ui/ui_unittests.gypi | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi index 28fa51a..f05215c 100644 --- a/ui/ui_unittests.gypi +++ b/ui/ui_unittests.gypi @@ -7,6 +7,9 @@ { 'target_name': 'ui_test_support', 'type': 'static_library', + 'includes': [ + 'base/ime/ime_test_support.gypi', + ], 'dependencies': [ '../base/base.gyp:base', '../testing/gtest.gyp:gtest', @@ -22,6 +25,14 @@ 'include_dirs': [ '../', ], + 'conditions': [ + ['chromeos==1', { + 'dependencies': [ + '../chromeos/chromeos.gyp:chromeos_test_support', + '../skia/skia.gyp:skia', + ] + }], + ], }, { 'target_name': 'ui_unittests', |