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

1 files changed, 1 insertions, 0 deletions

diff --git a/chrome/browser/chromeos/input_method/input_method_persistence.h b/chrome/browser/chromeos/input_method/input_method_persistence.h
index 27fba16..9e19921 100644
--- a/chrome/browser/chromeos/input_method/input_method_persistence.h
+++ b/chrome/browser/chromeos/input_method/input_method_persistence.h
@@ -31,6 +31,7 @@ class InputMethodPersistence : public InputMethodManager::Observer {
   // InputMethodManager::Observer overrides.
   virtual void InputMethodChanged(InputMethodManager* manager,
                                   bool show_message) OVERRIDE;
+  virtual void InputMethodPropertyChanged(InputMethodManager* manager) OVERRIDE;
 
  private:
   InputMethodManager* input_method_manager_;