commit 771a61858de4f2fdb386fc807354cd90c7e2f7da
author yusukes@chromium.org <yusukes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed Oct 05 16:32:52 2011
committer yusukes@chromium.org <yusukes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed Oct 05 16:32:52 2011
tree 6f800d7179a78d8c5962e318a81f3ae08e37c267
parent 79ca49e4436fea5719dd53ba59eb78daf5ad9672

Stop using ExtensionInputMethodEventRouter as a singleton.

This should be better since ~ExtensionInputMethodEventRouter depends on another singleton, InputMethodManager, and such dependency tend to cause a problem on shutdown.

BUG=chromium-os:21283
TEST=trybot


Review URL: http://codereview.chromium.org/7982052

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104113 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/extensions/extension_service.cc

diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index 1bc3aee..1754e6c 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -726,8 +726,9 @@
   file_browser_event_router_.reset(
       new ExtensionFileBrowserEventRouter(profile_));
   file_browser_event_router_->ObserveFileSystemEvents();
-  // Lazy initialization.
-  chromeos::ExtensionInputMethodEventRouter::GetInstance();
+
+  input_method_event_router_.reset(
+      new chromeos::ExtensionInputMethodEventRouter);
 
   ExtensionMediaPlayerEventRouter::GetInstance()->Init(profile_);
   ExtensionInputImeEventRouter::GetInstance()->Init();