Renames some WindowManager classes

mash/wm/window_manager_application.h

Index: mash/wm/window_manager_application.h
diff --git a/mash/wm/window_manager_application.h b/mash/wm/window_manager_application.h
index 0f06e73a9e4b51baa2912d4c4d9a1a96885cc0b5..4d3646be3f2dc9b662512eb22407f98a5abc216b 100644
--- a/mash/wm/window_manager_application.h
+++ b/mash/wm/window_manager_application.h
@@ -52,7 +52,7 @@ class WindowManagerApplication
       public mus::mojom::WindowTreeHostClient,
       public mus::WindowTreeDelegate,
       public mojo::InterfaceFactory<mash::wm::mojom::UserWindowController>,
-      public mojo::InterfaceFactory<mus::mojom::WindowManager>,
+      public mojo::InterfaceFactory<mus::mojom::WindowManagerDeprecated>,
       public mojo::InterfaceFactory<mus::mojom::AcceleratorRegistrar> {
  public:
   WindowManagerApplication();
@@ -99,10 +99,10 @@ class WindowManagerApplication
               mojo::InterfaceRequest<mus::mojom::AcceleratorRegistrar> request)
       override;
 
-  // InterfaceFactory<mus::mojom::WindowManager>:
-  void Create(
-      mojo::ApplicationConnection* connection,
-      mojo::InterfaceRequest<mus::mojom::WindowManager> request) override;
+  // InterfaceFactory<mus::mojom::WindowManagerDeprecated>:
+  void Create(mojo::ApplicationConnection* connection,
+              mojo::InterfaceRequest<mus::mojom::WindowManagerDeprecated>
+                  request) override;
 
   // mus::WindowObserver:
   void OnWindowDestroyed(mus::Window* window) override;
@@ -127,8 +127,10 @@ class WindowManagerApplication
   // |window_manager_| is created once OnEmbed() is called. Until that time
   // |requests_| stores any pending WindowManager interface requests.
   scoped_ptr<WindowManagerImpl> window_manager_;
-  mojo::WeakBindingSet<mus::mojom::WindowManager> window_manager_binding_;
-  std::vector<scoped_ptr<mojo::InterfaceRequest<mus::mojom::WindowManager>>>
+  mojo::WeakBindingSet<mus::mojom::WindowManagerDeprecated>
+      window_manager_binding_;
+  std::vector<
+      scoped_ptr<mojo::InterfaceRequest<mus::mojom::WindowManagerDeprecated>>>
       requests_;
 
   // |user_window_controller_| is created once OnEmbed() is called. Until that