Shuffles and renames ash/common/wm classes

ash/wm/panels/panel_layout_manager_unittest.cc

Index: ash/wm/panels/panel_layout_manager_unittest.cc
diff --git a/ash/wm/panels/panel_layout_manager_unittest.cc b/ash/wm/panels/panel_layout_manager_unittest.cc
index c70039f549bae3a980c40598977dbbb9d1046a3d..08a64b62ff07586c6f696e54f4159544922543df 100644
--- a/ash/wm/panels/panel_layout_manager_unittest.cc
+++ b/ash/wm/panels/panel_layout_manager_unittest.cc
@@ -5,6 +5,7 @@
 #include "ash/common/wm/panels/panel_layout_manager.h"
 
 #include "ash/ash_switches.h"
+#include "ash/aura/wm_window_aura.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/screen_util.h"
@@ -22,7 +23,6 @@
 #include "ash/test/shelf_view_test_api.h"
 #include "ash/test/shell_test_api.h"
 #include "ash/test/test_shelf_delegate.h"
-#include "ash/wm/aura/wm_window_aura.h"
 #include "ash/wm/mru_window_tracker.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
@@ -81,7 +81,7 @@ class PanelLayoutManagerTest : public test::AshTestBase {
   }
 
   views::Widget* GetCalloutWidgetForPanel(aura::Window* panel) {
-    wm::WmWindow* wm_panel = wm::WmWindowAura::Get(panel);
+    WmWindow* wm_panel = WmWindowAura::Get(panel);
     PanelLayoutManager* manager = PanelLayoutManager::Get(wm_panel);
     DCHECK(manager);
     PanelLayoutManager::PanelList::iterator found =