Shuffles and renames ash/common/wm classes

ash/wm/workspace/workspace_layout_manager_unittest.cc

Index: ash/wm/workspace/workspace_layout_manager_unittest.cc
diff --git a/ash/wm/workspace/workspace_layout_manager_unittest.cc b/ash/wm/workspace/workspace_layout_manager_unittest.cc
index e8b6dab75145dbcf24c6e579e2e1752a404940c5..f3080ec7c229d98804edbb2b6b71e29469595ed6 100644
--- a/ash/wm/workspace/workspace_layout_manager_unittest.cc
+++ b/ash/wm/workspace/workspace_layout_manager_unittest.cc
@@ -7,6 +7,7 @@
 #include <string>
 #include <utility>
 
+#include "ash/aura/wm_window_aura.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm/wm_event.h"
@@ -21,7 +22,6 @@
 #include "ash/shell_observer.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/display_manager_test_api.h"
-#include "ash/wm/aura/wm_window_aura.h"
 #include "ash/wm/maximize_mode/workspace_backdrop_delegate.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
@@ -827,7 +827,7 @@ namespace {
 
 WorkspaceLayoutManager* GetWorkspaceLayoutManager(aura::Window* container) {
   return static_cast<WorkspaceLayoutManager*>(
-      wm::WmWindowAura::Get(container)->GetLayoutManager());
+      WmWindowAura::Get(container)->GetLayoutManager());
 }
 
 class WorkspaceLayoutManagerBackdropTest : public test::AshTestBase {