|
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
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=251194
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+161 lines, -485 lines) |
Patch |
 |
M |
trunk/src/ash/ash.gyp
|
View
|
|
2 chunks |
+0 lines, -6 lines |
0 comments
|
Download
|
 |
D |
trunk/src/ash/ime/input_method_menu_item.h
|
View
|
|
1 chunk |
+0 lines, -44 lines |
0 comments
|
Download
|
 |
D |
trunk/src/ash/ime/input_method_menu_item.cc
|
View
|
|
1 chunk |
+0 lines, -54 lines |
0 comments
|
Download
|
 |
D |
trunk/src/ash/ime/input_method_menu_item_unittest.cc
|
View
|
|
1 chunk |
+0 lines, -32 lines |
0 comments
|
Download
|
 |
D |
trunk/src/ash/ime/input_method_menu_manager.h
|
View
|
|
1 chunk |
+0 lines, -64 lines |
0 comments
|
Download
|
 |
D |
trunk/src/ash/ime/input_method_menu_manager.cc
|
View
|
|
1 chunk |
+0 lines, -77 lines |
0 comments
|
Download
|
 |
D |
trunk/src/ash/ime/input_method_menu_manager_unittest.cc
|
View
|
|
1 chunk |
+0 lines, -89 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/browser/chromeos/extensions/input_method_event_router.h
|
View
|
|
1 chunk |
+2 lines, -0 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/browser/chromeos/input_method/accessibility.h
|
View
|
|
1 chunk |
+2 lines, -0 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/browser/chromeos/input_method/accessibility.cc
|
View
|
|
1 chunk |
+4 lines, -0 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/browser/chromeos/input_method/input_method_engine.h
|
View
|
|
2 chunks |
+3 lines, -8 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/browser/chromeos/input_method/input_method_engine.cc
|
View
|
|
3 chunks |
+9 lines, -9 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc
|
View
|
|
2 chunks |
+2 lines, -5 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/browser/chromeos/input_method/input_method_manager_impl.h
|
View
|
|
4 chunks |
+11 lines, -1 line |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/browser/chromeos/input_method/input_method_manager_impl.cc
|
View
|
|
6 chunks |
+33 lines, -18 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc
|
View
|
|
10 chunks |
+44 lines, -51 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/browser/chromeos/input_method/input_method_persistence.h
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/browser/chromeos/input_method/input_method_persistence.cc
|
View
|
|
1 chunk |
+3 lines, -0 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/browser/chromeos/input_method/mock_input_method_engine.h
|
View
|
|
1 chunk |
+1 line, -6 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/browser/chromeos/input_method/mock_input_method_manager.h
|
View
|
|
2 chunks |
+5 lines, -1 line |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/browser/chromeos/input_method/mock_input_method_manager.cc
|
View
|
|
2 chunks |
+10 lines, -1 line |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/browser/chromeos/input_method/mode_indicator_controller.h
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/browser/chromeos/input_method/mode_indicator_controller.cc
|
View
|
|
1 chunk |
+5 lines, -0 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
|
View
|
|
3 chunks |
+3 lines, -6 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
|
View
|
|
6 chunks |
+11 lines, -15 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chromeos/chromeos.gyp
|
View
|
|
2 chunks |
+3 lines, -0 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chromeos/ime/input_method_manager.h
|
View
|
|
4 chunks |
+11 lines, -1 line |
0 comments
|
Download
|
 |
A + |
trunk/src/chromeos/ime/input_method_property.h
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
 |
A + |
trunk/src/chromeos/ime/input_method_property.cc
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
 |
A + |
trunk/src/chromeos/ime/input_method_property_unittest.cc
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
Total messages: 3 (0 generated)
|