Converts remaining usage of WmLayoutManager to aura::LayoutManager

ash/wm/wm_snap_to_pixel_layout_manager.h

Index: ash/wm/wm_snap_to_pixel_layout_manager.h
diff --git a/ash/wm/wm_snap_to_pixel_layout_manager.h b/ash/wm/wm_snap_to_pixel_layout_manager.h
index 2d201e638a63aab3a490657e2da488887b58716f..3e9ac7518b493a8c6b32056d1ae6bf0d1dcfaf1e 100644
--- a/ash/wm/wm_snap_to_pixel_layout_manager.h
+++ b/ash/wm/wm_snap_to_pixel_layout_manager.h
@@ -6,31 +6,32 @@
 #define ASH_WM_WM_SNAP_TO_PIXEL_LAYOUT_MANAGER_H_
 
 #include "ash/ash_export.h"
-#include "ash/wm_layout_manager.h"
 #include "base/macros.h"
+#include "ui/aura/layout_manager.h"
 
 namespace ash {
 namespace wm {
 
 // A layout manager that places children's layer at the physical pixel
 // boundaries.
-class ASH_EXPORT WmSnapToPixelLayoutManager : public WmLayoutManager {
+class ASH_EXPORT WmSnapToPixelLayoutManager : public aura::LayoutManager {
  public:
   WmSnapToPixelLayoutManager();
   ~WmSnapToPixelLayoutManager() override;
 
   // Sets WmSnapToPixelLayoutManager as the LayoutManager on the appropriate
   // descendants of |window|.
-  static void InstallOnContainers(WmWindow* window);
+  static void InstallOnContainers(aura::Window* window);
 
  protected:
   // Overridden from aura::LayoutManager:
   void OnWindowResized() override;
-  void OnWindowAddedToLayout(WmWindow* child) override;
-  void OnWillRemoveWindowFromLayout(WmWindow* child) override;
-  void OnWindowRemovedFromLayout(WmWindow* child) override;
-  void OnChildWindowVisibilityChanged(WmWindow* child, bool visibile) override;
-  void SetChildBounds(WmWindow* child,
+  void OnWindowAddedToLayout(aura::Window* child) override;
+  void OnWillRemoveWindowFromLayout(aura::Window* child) override;
+  void OnWindowRemovedFromLayout(aura::Window* child) override;
+  void OnChildWindowVisibilityChanged(aura::Window* child,
+                                      bool visibile) override;
+  void SetChildBounds(aura::Window* child,
                       const gfx::Rect& requested_bounds) override;
 
  private: