Cleanup after removing views-mus code

ui/views/mus/mus_client.h

 // Copyright 2016 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_VIEWS_MUS_MUS_CLIENT_H_
 #define UI_VIEWS_MUS_MUS_CLIENT_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 32 matching lines @@
 class Gpu;
 }
 
 namespace wm {
 class WMState;
 }
 
 namespace views {
 
 class MusClientObserver;
-class PointerWatcherEventRouter2;
+class PointerWatcherEventRouter;
 class ScreenMus;
 
 namespace internal {
 class NativeWidgetDelegate;
 }
 
 namespace test {
 class MusClientTestApi;
 }
 
@@ skipping 25 matching lines @@
       const Widget::InitParams& init_params);
 
   // Returns the properties to supply to mus when creating a window.
   static std::map<std::string, std::vector<uint8_t>>
   ConfigurePropertiesFromParams(const Widget::InitParams& init_params);
 
   aura::WindowTreeClient* window_tree_client() {
     return window_tree_client_.get();
   }
 
-  PointerWatcherEventRouter2* pointer_watcher_event_router() {
+  PointerWatcherEventRouter* pointer_watcher_event_router() {
     return pointer_watcher_event_router_.get();
   }
 
   ui::Gpu* gpu() { return gpu_.get(); }
 
   // Creates DesktopNativeWidgetAura with DesktopWindowTreeHostMus. This is
   // set as the factory function used for creating NativeWidgets when a
   //  NativeWidget has not been explicitly set.
   NativeWidget* CreateNativeWidget(const Widget::InitParams& init_params,
                                    internal::NativeWidgetDelegate* delegate);
@@ skipping 36 matching lines @@
   std::unique_ptr<wm::WMState> wm_state_;
 
   std::unique_ptr<ScreenMus> screen_;
 
   std::unique_ptr<aura::PropertyConverter> property_converter_;
 
   std::unique_ptr<aura::WindowTreeClient> window_tree_client_;
 
   std::unique_ptr<ui::Gpu> gpu_;
 
-  std::unique_ptr<PointerWatcherEventRouter2> pointer_watcher_event_router_;
+  std::unique_ptr<PointerWatcherEventRouter> pointer_watcher_event_router_;
 
   std::unique_ptr<aura::MusContextFactory> compositor_context_factory_;
 
   std::unique_ptr<discardable_memory::ClientDiscardableSharedMemoryManager>
       discardable_shared_memory_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(MusClient);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_MUS_MUS_CLIENT_H_