Shuffles and renames ash/common/wm classes

ash/wm/workspace/multi_window_resize_controller_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/common/wm/workspace/multi_window_resize_controller.h"
 
 #include "ash/ash_constants.h"
+#include "ash/aura/wm_window_aura.h"
 #include "ash/frame/custom_frame_view_ash.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/shell_test_api.h"
-#include "ash/wm/aura/wm_window_aura.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace/workspace_event_handler_test_helper.h"
 #include "ash/wm/workspace_controller.h"
 #include "ash/wm/workspace_controller_test_helper.h"
 #include "base/stl_util.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"
 #include "ui/base/hit_test.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/views/widget/widget.h"
@@ skipping 65 matching lines @@
     return resize_controller_->show_timer_.IsRunning();
   }
 
   void Hide() {
     resize_controller_->Hide();
   }
 
   bool HasTarget(aura::Window* window) {
     if (!resize_controller_->windows_.is_valid())
       return false;
-    wm::WmWindow* wm_window = wm::WmWindowAura::Get(window);
+    WmWindow* wm_window = WmWindowAura::Get(window);
     if ((resize_controller_->windows_.window1 == wm_window ||
          resize_controller_->windows_.window2 == wm_window))
       return true;
     return ContainsValue(resize_controller_->windows_.other_windows, wm_window);
   }
 
   bool IsOverWindows(const gfx::Point& loc) {
     return resize_controller_->IsOverWindows(loc);
   }
 
@@ skipping 255 matching lines @@
 
   // Clicking outside the resize handle should immediately hide the resize
   // handle.
   EXPECT_FALSE(resize_widget_bounds_in_screen.Contains(w1_center_in_screen));
   generator.MoveMouseTo(w1_center_in_screen);
   generator.ClickLeftButton();
   EXPECT_FALSE(IsShowing());
 }
 
 }  // namespace ash