Shuffles and renames ash/common/wm classes

ash/shelf/shelf_window_watcher_unittest.cc

 // Copyright 2013 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/shelf/shelf_window_watcher.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_resizer.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/shelf/shelf_item_types.h"
 #include "ash/shelf/shelf_model.h"
 #include "ash/shelf/shelf_util.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_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "base/command_line.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/base/hit_test.h"
 
 namespace ash {
 
 class ShelfWindowWatcherTest : public test::AshTestBase {
@@ skipping 192 matching lines @@
 
   // Create a ShelfItem for |window|.
   ShelfID id = CreateShelfItem(window.get());
   EXPECT_EQ(2, model_->item_count());
 
   int index = model_->ItemIndexByID(id);
   EXPECT_EQ(STATUS_RUNNING, model_->items()[index].status);
 
   // Simulate dragging of |window| and check its item is not changed.
   std::unique_ptr<WindowResizer> resizer(
-      CreateWindowResizer(wm::WmWindowAura::Get(window.get()), gfx::Point(),
+      CreateWindowResizer(WmWindowAura::Get(window.get()), gfx::Point(),
                           HTCAPTION, aura::client::WINDOW_MOVE_SOURCE_MOUSE));
   ASSERT_TRUE(resizer.get());
   resizer->Drag(gfx::Point(50, 50), 0);
   resizer->CompleteDrag();
 
   //Index and id are not changed after dragging a |window|.
   EXPECT_EQ(index, model_->ItemIndexByID(id));
   EXPECT_EQ(id, model_->items()[index].id);
 }
 
@@ skipping 18 matching lines @@
       kShellWindowId_DefaultContainer);
   EXPECT_EQ(default_container, window->parent());
 
   aura::Window* new_parent = Shell::GetContainer(
       root_window,
       kShellWindowId_PanelContainer);
 
   // Simulate re-parenting to |new_parent| during the dragging.
   {
     std::unique_ptr<WindowResizer> resizer(
-        CreateWindowResizer(wm::WmWindowAura::Get(window.get()), gfx::Point(),
+        CreateWindowResizer(WmWindowAura::Get(window.get()), gfx::Point(),
                             HTCAPTION, aura::client::WINDOW_MOVE_SOURCE_MOUSE));
     ASSERT_TRUE(resizer.get());
     resizer->Drag(gfx::Point(50, 50), 0);
     resizer->CompleteDrag();
     EXPECT_EQ(2, model_->item_count());
 
     // Item should be removed when |window| is re-parented not to default
     // container before fininshing the dragging.
     EXPECT_TRUE(wm::GetWindowState(window.get())->is_dragged());
     new_parent->AddChild(window.get());
     EXPECT_EQ(1, model_->item_count());
   }
   EXPECT_FALSE(wm::GetWindowState(window.get())->is_dragged());
   EXPECT_EQ(1, model_->item_count());
 }
 
 }  // namespace ash