Make EnvInputStateController owned by aura::Env.

ui/aura/window_event_dispatcher.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 UI_AURA_WINDOW_EVENT_DISPATCHER_H_
 #define UI_AURA_WINDOW_EVENT_DISPATCHER_H_
 
 #include <memory>
 #include <vector>
 
@@ skipping 20 matching lines @@
 namespace ui {
 class GestureEvent;
 class GestureRecognizer;
 class MouseEvent;
 class TouchEvent;
 }
 
 namespace aura {
 class MusMouseLocationUpdater;
 class TestScreen;
-class EnvInputStateController;
 class WindowTargeter;
 class WindowTreeHost;
 
 namespace test {
 class WindowEventDispatcherTestApi;
 }
 
 // WindowEventDispatcher orchestrates event dispatch within a window tree
 // owned by WindowTreeHost. WTH also owns the WED.
 // TODO(beng): In progress, remove functionality not directly related to
@@ skipping 207 matching lines @@
   std::unique_ptr<ui::LocatedEvent> held_move_event_;
 
   // Allowing for reposting of events. Used when exiting context menus.
   std::unique_ptr<ui::LocatedEvent> held_repostable_event_;
 
   // Set when dispatching a held event.
   ui::LocatedEvent* dispatching_held_event_;
 
   ScopedObserver<aura::Window, aura::WindowObserver> observer_manager_;
 
-  std::unique_ptr<EnvInputStateController> env_controller_;
-
   std::unique_ptr<MusMouseLocationUpdater> mus_mouse_location_updater_;
 
   // The default EventTargeter for WindowEventDispatcher generated events.
   std::unique_ptr<WindowTargeter> event_targeter_;
 
   // Used to schedule reposting an event.
   base::WeakPtrFactory<WindowEventDispatcher> repost_event_factory_;
 
   // Used to schedule DispatchHeldEvents() when |move_hold_count_| goes to 0.
   base::WeakPtrFactory<WindowEventDispatcher> held_event_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowEventDispatcher);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_WINDOW_EVENT_DISPATCHER_H_