diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-14 00:01:16 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-14 00:01:16 +0000 |
| commit | 74406267b2d7ca386de93f316e9017cfcf4e60fd (patch) | |
| tree | 4430aefe67e409a05789ed07a0fc623f601e4421 /chromeos/chromeos.gyp | |
| parent | 93e6e7d6ded011cc4f7634ffe74c59b096f6e8c9 (diff) | |
| download | chromium_src-74406267b2d7ca386de93f316e9017cfcf4e60fd.zip chromium_src-74406267b2d7ca386de93f316e9017cfcf4e60fd.tar.gz chromium_src-74406267b2d7ca386de93f316e9017cfcf4e60fd.tar.bz2 | |
Revert 251164 "Split out InputMethodMenuManager from InputMethod..."
> Split out InputMethodMenuManager from InputMethodManager.
>
> Rename input_method_property to input_method_menu_item, and move to ash/ime.
>
> BUG=342336, 343044
>
> Review URL: https://codereview.chromium.org/150203015
I'm reverting as test appears to be consistently failing:
http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Tests%20%281%29/builds/39558/steps/ash_unittests/logs/TestUninitializedGet
InputMethodMenuManagerTest.TestUninitializedGet (run #1):
[ RUN ] InputMethodMenuManagerTest.TestUninitializedGet
[WARNING] ../../testing/gtest/src/gtest-death-test.cc:825:: Death
tests use fork(), which is unsafe particularly in a threaded
context. For this test, Google Test couldn't detect the number of
threads.
../../ash/ime/input_method_menu_manager_unittest.cc:16: Failure
Death test: InputMethodMenuManager::Get()
Result: failed to die.
Error msg:
[ DEATH ]
[ FAILED ] InputMethodMenuManagerTest.TestUninitializedGet (4 ms)
InputMethodMenuManagerTest.TestUninitializedGet (run #2):
[ RUN ] InputMethodMenuManagerTest.TestUninitializedGet
[WARNING] ../../testing/gtest/src/gtest-death-test.cc:825:: Death
tests use fork(), which is unsafe particularly in a threaded
context. For this test, Google Test couldn't detect the number of
threads.
../../ash/ime/input_method_menu_manager_unittest.cc:16: Failure
Death test: InputMethodMenuManager::Get()
Result: failed to die.
Error msg:
[ DEATH ]
[ FAILED ] InputMethodMenuManagerTest.TestUninitializedGet (2 ms)
InputMethodMenuManagerTest.TestUninitializedGet (run #3):
[ RUN ] InputMethodMenuManagerTest.TestUninitializedGet
[WARNING] ../../testing/gtest/src/gtest-death-test.cc:825:: Death
tests use fork(), which is unsafe particularly in a threaded
context. For this test, Google Test couldn't detect the number of
threads.
../../ash/ime/input_method_menu_manager_unittest.cc:16: Failure
Death test: InputMethodMenuManager::Get()
Result: failed to die.
Error msg:
[ DEATH ]
[ FAILED ] InputMethodMenuManagerTest.TestUninitializedGet (2 ms)
InputMethodMenuManagerTest.TestUninitializedGet (run #4):
[ RUN ] InputMethodMenuManagerTest.TestUninitializedGet
[WARNING] ../../testing/gtest/src/gtest-death-test.cc:825:: Death
tests use fork(), which is unsafe particularly in a threaded
context. For this test, Google Test couldn't detect the number of
threads.
../../ash/ime/input_method_menu_manager_unittest.cc:16: Failure
Death test: InputMethodMenuManager::Get()
Result: failed to die.
Error msg:
[ DEATH ]
[ FAILED ] InputMethodMenuManagerTest.TestUninitializedGet (1 ms)
TBR=uekawa@chromium.org
Review URL: https://codereview.chromium.org/165453002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251194 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/chromeos.gyp')
| -rw-r--r-- | chromeos/chromeos.gyp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chromeos/chromeos.gyp b/chromeos/chromeos.gyp index 924d8cf..1597cb6 100644 --- a/chromeos/chromeos.gyp +++ b/chromeos/chromeos.gyp @@ -228,6 +228,8 @@ 'ime/input_method_descriptor.h', 'ime/input_method_manager.cc', 'ime/input_method_manager.h', + 'ime/input_method_property.cc', + 'ime/input_method_property.h', 'ime/input_method_whitelist.cc', 'ime/input_method_whitelist.h', 'ime/xkeyboard.cc', @@ -489,6 +491,7 @@ 'ime/extension_ime_util_unittest.cc', 'ime/composition_text_unittest.cc', 'ime/input_method_manager.h', + 'ime/input_method_property_unittest.cc', 'ime/input_method_whitelist_unittest.cc', 'ime/xkeyboard_unittest.cc', 'login/login_state_unittest.cc', |