Revert 278342 "Convert sticky keys to a chromeos::EventRewriter ..."

trunk/src/chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Index: trunk/src/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
===================================================================
--- trunk/src/chrome/browser/chromeos/chrome_browser_main_chromeos.cc	(revision 278418)
+++ trunk/src/chrome/browser/chromeos/chrome_browser_main_chromeos.cc	(working copy)
@@ -730,6 +730,11 @@
   // Start the CrOS input device UMA watcher
   DeviceUMA::GetInstance();
 #endif
+  keyboard_event_rewriters_.reset(new EventRewriterController());
+  keyboard_event_rewriters_->AddEventRewriter(
+      scoped_ptr<ui::EventRewriter>(new KeyboardDrivenEventRewriter()));
+  keyboard_event_rewriters_->AddEventRewriter(
+      scoped_ptr<ui::EventRewriter>(new EventRewriter()));
 
   // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun()
   // -- immediately after ChildProcess::WaitForDebugger().
@@ -752,13 +757,7 @@
   // These are dependent on the ash::Shell singleton already having been
   // initialized.
   power_button_observer_.reset(new PowerButtonObserver);
-  data_promo_notification_.reset(new DataPromoNotification());
-
-  keyboard_event_rewriters_.reset(new EventRewriterController());
-  keyboard_event_rewriters_->AddEventRewriter(
-      scoped_ptr<ui::EventRewriter>(new KeyboardDrivenEventRewriter()));
-  keyboard_event_rewriters_->AddEventRewriter(scoped_ptr<ui::EventRewriter>(
-      new EventRewriter(ash::Shell::GetInstance()->sticky_keys_controller())));
+  data_promo_notification_.reset(new DataPromoNotification()),
   keyboard_event_rewriters_->Init();
 
   ChromeBrowserMainPartsLinux::PostBrowserStart();