Refactors DockedWindowLayoutManager in terms of ash/wm/common

ash/system/tray/system_tray_unittest.cc

Index: ash/system/tray/system_tray_unittest.cc
diff --git a/ash/system/tray/system_tray_unittest.cc b/ash/system/tray/system_tray_unittest.cc
index ac972887de2c1164b940ddf822e4cf252abcdd28..f77b4e2c2faa25716bbffaf3d0eb1cb78de3e5bb 100644
--- a/ash/system/tray/system_tray_unittest.cc
+++ b/ash/system/tray/system_tray_unittest.cc
@@ -182,7 +182,7 @@ TEST_F(SystemTrayTest, SystemTrayColoringAfterAlignmentChange) {
   ASSERT_TRUE(tray->GetWidget());
   ShelfLayoutManager* manager =
       Shell::GetPrimaryRootWindowController()->shelf()->shelf_layout_manager();
-  manager->SetAlignment(SHELF_ALIGNMENT_BOTTOM);
+  manager->SetAlignment(wm::SHELF_ALIGNMENT_BOTTOM);
   // At the beginning the tray coloring is not active.
   ASSERT_FALSE(tray->draw_background_as_active());
 
@@ -192,7 +192,7 @@ TEST_F(SystemTrayTest, SystemTrayColoringAfterAlignmentChange) {
 
   // Changing the alignment should close the system bubble and change the
   // background color.
-  manager->SetAlignment(SHELF_ALIGNMENT_LEFT);
+  manager->SetAlignment(wm::SHELF_ALIGNMENT_LEFT);
   ASSERT_FALSE(tray->draw_background_as_active());
   RunAllPendingInMessageLoop();
   // The bubble should already be closed by now.
@@ -357,7 +357,7 @@ TEST_F(SystemTrayTest, TrayBoundsInWidget) {
   SystemTray* tray = widget->system_tray();
 
   // Test in bottom alignment.
-  manager->SetAlignment(SHELF_ALIGNMENT_BOTTOM);
+  manager->SetAlignment(wm::SHELF_ALIGNMENT_BOTTOM);
   gfx::Rect window_bounds = widget->GetWindowBoundsInScreen();
   gfx::Rect tray_bounds = tray->GetBoundsInScreen();
   EXPECT_TRUE(window_bounds.bottom() >= tray_bounds.bottom());
@@ -366,7 +366,7 @@ TEST_F(SystemTrayTest, TrayBoundsInWidget) {
   EXPECT_TRUE(window_bounds.y() >= tray_bounds.y());
 
   // Test in locked alignment.
-  manager->SetAlignment(SHELF_ALIGNMENT_BOTTOM_LOCKED);
+  manager->SetAlignment(wm::SHELF_ALIGNMENT_BOTTOM_LOCKED);
   window_bounds = widget->GetWindowBoundsInScreen();
   tray_bounds = tray->GetBoundsInScreen();
   EXPECT_TRUE(window_bounds.bottom() >= tray_bounds.bottom());
@@ -375,7 +375,7 @@ TEST_F(SystemTrayTest, TrayBoundsInWidget) {
   EXPECT_TRUE(window_bounds.y() >= tray_bounds.y());
 
   // Test in the left alignment.
-  manager->SetAlignment(SHELF_ALIGNMENT_LEFT);
+  manager->SetAlignment(wm::SHELF_ALIGNMENT_LEFT);
   window_bounds = widget->GetWindowBoundsInScreen();
   tray_bounds = tray->GetBoundsInScreen();
   EXPECT_TRUE(window_bounds.bottom() >= tray_bounds.bottom());
@@ -384,7 +384,7 @@ TEST_F(SystemTrayTest, TrayBoundsInWidget) {
   EXPECT_TRUE(window_bounds.y() >= tray_bounds.y());
 
   // Test in the right alignment.
-  manager->SetAlignment(SHELF_ALIGNMENT_LEFT);
+  manager->SetAlignment(wm::SHELF_ALIGNMENT_LEFT);
   window_bounds = widget->GetWindowBoundsInScreen();
   tray_bounds = tray->GetBoundsInScreen();
   EXPECT_TRUE(window_bounds.bottom() >= tray_bounds.bottom());