Do not use ash in chromeos::EventRewriter.

chrome/browser/chromeos/events/event_rewriter.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_CHROMEOS_EVENTS_EVENT_REWRITER_H_
 #define CHROME_BROWSER_CHROMEOS_EVENTS_EVENT_REWRITER_H_
 
 #include <map>
 #include <memory>
 #include <set>
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/containers/hash_tables.h"
 #include "base/macros.h"
 #include "ui/events/event.h"
 #include "ui/events/event_rewriter.h"
 #include "ui/events/keycodes/dom/dom_key.h"
 
 class PrefService;
 
-namespace ash {
-class StickyKeysController;
-}
-
 namespace ui {
 enum class DomCode;
 };
 
 namespace chromeos {
 namespace input_method {
 class ImeKeyboard;
 }
 
 // EventRewriter makes various changes to keyboard-related events,
@@ skipping 19 matching lines @@
   struct MutableKeyState {
     int flags;
     ui::DomCode code;
     ui::DomKey::Base key;
     ui::KeyboardCode key_code;
   };
 
   // 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);
+  explicit EventRewriter(ui::EventRewriter* sticky_keys_controller);
   ~EventRewriter() override;
 
   // Calls KeyboardDeviceAddedInternal.
   DeviceType KeyboardDeviceAddedForTesting(int device_id,
                                            const std::string& device_name);
 
   // Calls RewriteMouseEvent().
   void RewriteMouseButtonEventForTesting(
       const ui::MouseEvent& event,
       std::unique_ptr<ui::Event>* rewritten_event);
@@ skipping 96 matching lines @@
 
   // The |source_device_id()| of the most recent keyboard event,
   // used to interpret modifiers on pointer events.
   int last_keyboard_device_id_;
 
   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_;
+  ui::EventRewriter* const sticky_keys_controller_;
 
   // Some keyboard layouts have 'latching' keys, which either apply
   // a modifier while held down (like normal modifiers), or, if no
   // non-modifier is pressed while the latching key is down, apply the
   // modifier to the next non-modifier keypress. Under Ozone the stateless
   // layout model requires this to be handled explicitly. See crbug.com/518237
   // Pragmatically this, like the Diamond key, is handled here in
   // EventRewriter, but modifier state management is scattered between
   // here, sticky keys, and the system layer (X11 or Ozone), and could
   // do with refactoring.
   // - |pressed_modifier_latches_| records the latching keys currently pressed.
   //   It also records the active modifier flags for non-modifier keys that are
   //   remapped to modifiers, e.g. Diamond/F15.
   // - |latched_modifier_latches_| records the latching keys just released,
   //   to be applied to the next non-modifier key.
   // - |used_modifier_latches_| records the latching keys applied to a non-
   //   modifier while pressed, so that they do not get applied after release.
   int pressed_modifier_latches_;
   int latched_modifier_latches_;
   int used_modifier_latches_;
 
   DISALLOW_COPY_AND_ASSIGN(EventRewriter);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_EVENTS_EVENT_REWRITER_H_