Shuffles and renames ash/common/wm classes

ash/mus/bridge/mus_layout_manager_adapter.h

Index: ash/mus/bridge/mus_layout_manager_adapter.h
diff --git a/ash/mus/bridge/mus_layout_manager_adapter.h b/ash/mus/bridge/mus_layout_manager_adapter.h
index f1d0f4009e439a685263429a205096a81bd3ad53..d1b5b2403828ba94c879355d6163a304bb600f3f 100644
--- a/ash/mus/bridge/mus_layout_manager_adapter.h
+++ b/ash/mus/bridge/mus_layout_manager_adapter.h
@@ -11,13 +11,11 @@
 #include "components/mus/public/cpp/window_observer.h"
 
 namespace ash {
-namespace wm {
 class WmLayoutManager;
-}
 
 namespace mus {
 
-// Used to associate a mus::Window with an wm::WmLayoutManager. This
+// Used to associate a mus::Window with an WmLayoutManager. This
 // attaches an observer to the mus::Window and calls the appropriate methods on
 // the WmLayoutManager at the appropriate time.
 //
@@ -30,10 +28,10 @@ namespace mus {
 class MusLayoutManagerAdapter : public ::mus::WindowObserver {
  public:
   MusLayoutManagerAdapter(::mus::Window* window,
-                          std::unique_ptr<wm::WmLayoutManager> layout_manager);
+                          std::unique_ptr<WmLayoutManager> layout_manager);
   ~MusLayoutManagerAdapter() override;
 
-  wm::WmLayoutManager* layout_manager() { return layout_manager_.get(); }
+  WmLayoutManager* layout_manager() { return layout_manager_.get(); }
 
  private:
   // WindowObserver attached to child windows. A separate class is used to
@@ -62,7 +60,7 @@ class MusLayoutManagerAdapter : public ::mus::WindowObserver {
 
   ::mus::Window* window_;
   ChildWindowObserver child_window_observer_;
-  std::unique_ptr<wm::WmLayoutManager> layout_manager_;
+  std::unique_ptr<WmLayoutManager> layout_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(MusLayoutManagerAdapter);
 };