Revert of Convert sticky keys to a chromeos::EventRewriter phase.

chrome/browser/chromeos/events/event_rewriter.h

Index: chrome/browser/chromeos/events/event_rewriter.h
diff --git a/chrome/browser/chromeos/events/event_rewriter.h b/chrome/browser/chromeos/events/event_rewriter.h
index 1c946c930cea9f2aef2a720148f5ea6af3b122ff..3763a89e0cdbbd03420207c6d7cfbba07c39c6eb 100644
--- a/chrome/browser/chromeos/events/event_rewriter.h
+++ b/chrome/browser/chromeos/events/event_rewriter.h
@@ -22,10 +22,6 @@
 #endif
 
 class PrefService;
-
-namespace ash {
-class StickyKeysController;
-}
 
 namespace chromeos {
 namespace input_method {
@@ -55,10 +51,7 @@
     kDeviceAppleKeyboard,
   };
 
-  // Does not take ownership of the |sticky_keys_controller|, which may also
-  // be NULL (for testing without ash), in which case sticky key operations
-  // don't happen.
-  explicit EventRewriter(ash::StickyKeysController* sticky_keys_controller);
+  EventRewriter();
   virtual ~EventRewriter();
 
   // Calls DeviceAddedInternal.
@@ -105,7 +98,7 @@
 #endif
 
  private:
-  // Things that keyboard-related rewriter phases can change about an Event.
+  // Things that internal rewriter phases can change about an Event.
   struct MutableKeyState {
     int flags;
     ui::KeyboardCode key_code;
@@ -164,9 +157,6 @@
   ui::EventRewriteStatus RewriteTouchEvent(
       const ui::TouchEvent& touch_event,
       scoped_ptr<ui::Event>* rewritten_event);
-  ui::EventRewriteStatus RewriteScrollEvent(
-      const ui::ScrollEvent& scroll_event,
-      scoped_ptr<ui::Event>* rewritten_event);
 
   // Rewriter phases. These can inspect the original |event|, but operate using
   // the current |state|, which may have been modified by previous phases.
@@ -185,10 +175,6 @@
   chromeos::input_method::ImeKeyboard* ime_keyboard_for_testing_;
   const PrefService* pref_service_for_testing_;
 
-  // The sticky keys controller is not owned here;
-  // at time of writing it is a singleton in ash::Shell>
-  ash::StickyKeysController* sticky_keys_controller_;
-
   DISALLOW_COPY_AND_ASSIGN(EventRewriter);
 };