Refactors DockedWindowLayoutManager in terms of ash/wm/common

ash/shelf/shelf_locking_manager_unittest.cc

Index: ash/shelf/shelf_locking_manager_unittest.cc
diff --git a/ash/shelf/shelf_locking_manager_unittest.cc b/ash/shelf/shelf_locking_manager_unittest.cc
index d46de3fc06b68d386278f2b6e894e951bcab84c6..edbbd831a8afb3ddde786fa8fc5459649b6c14d0 100644
--- a/ash/shelf/shelf_locking_manager_unittest.cc
+++ b/ash/shelf/shelf_locking_manager_unittest.cc
@@ -36,47 +36,47 @@ class ShelfLockingManagerTest : public ash::test::AshTestBase {
 // Makes sure shelf alignment is correct for lock screen.
 TEST_F(ShelfLockingManagerTest, AlignmentLockedWhileScreenLocked) {
   Shelf* shelf = Shelf::ForPrimaryDisplay();
-  EXPECT_EQ(SHELF_ALIGNMENT_BOTTOM, shelf->alignment());
+  EXPECT_EQ(wm::SHELF_ALIGNMENT_BOTTOM, shelf->alignment());
 
-  shelf->SetAlignment(SHELF_ALIGNMENT_LEFT);
-  EXPECT_EQ(SHELF_ALIGNMENT_LEFT, shelf->alignment());
+  shelf->SetAlignment(wm::SHELF_ALIGNMENT_LEFT);
+  EXPECT_EQ(wm::SHELF_ALIGNMENT_LEFT, shelf->alignment());
 
   SetScreenLocked(true);
-  EXPECT_EQ(SHELF_ALIGNMENT_BOTTOM_LOCKED, shelf->alignment());
+  EXPECT_EQ(wm::SHELF_ALIGNMENT_BOTTOM_LOCKED, shelf->alignment());
   SetScreenLocked(false);
-  EXPECT_EQ(SHELF_ALIGNMENT_LEFT, shelf->alignment());
+  EXPECT_EQ(wm::SHELF_ALIGNMENT_LEFT, shelf->alignment());
 }
 
 // Makes sure shelf alignment is correct for login and add user screens.
 TEST_F(ShelfLockingManagerTest, AlignmentLockedWhileSessionLocked) {
   Shelf* shelf = Shelf::ForPrimaryDisplay();
-  EXPECT_EQ(SHELF_ALIGNMENT_BOTTOM, shelf->alignment());
+  EXPECT_EQ(wm::SHELF_ALIGNMENT_BOTTOM, shelf->alignment());
 
-  shelf->SetAlignment(SHELF_ALIGNMENT_RIGHT);
-  EXPECT_EQ(SHELF_ALIGNMENT_RIGHT, shelf->alignment());
+  shelf->SetAlignment(wm::SHELF_ALIGNMENT_RIGHT);
+  EXPECT_EQ(wm::SHELF_ALIGNMENT_RIGHT, shelf->alignment());
 
   SetSessionState(SessionStateDelegate::SESSION_STATE_LOGIN_PRIMARY);
-  EXPECT_EQ(SHELF_ALIGNMENT_BOTTOM_LOCKED, shelf->alignment());
+  EXPECT_EQ(wm::SHELF_ALIGNMENT_BOTTOM_LOCKED, shelf->alignment());
   SetSessionState(SessionStateDelegate::SESSION_STATE_ACTIVE);
-  EXPECT_EQ(SHELF_ALIGNMENT_RIGHT, shelf->alignment());
+  EXPECT_EQ(wm::SHELF_ALIGNMENT_RIGHT, shelf->alignment());
 
   SetSessionState(SessionStateDelegate::SESSION_STATE_LOGIN_SECONDARY);
-  EXPECT_EQ(SHELF_ALIGNMENT_BOTTOM_LOCKED, shelf->alignment());
+  EXPECT_EQ(wm::SHELF_ALIGNMENT_BOTTOM_LOCKED, shelf->alignment());
   SetSessionState(SessionStateDelegate::SESSION_STATE_ACTIVE);
-  EXPECT_EQ(SHELF_ALIGNMENT_RIGHT, shelf->alignment());
+  EXPECT_EQ(wm::SHELF_ALIGNMENT_RIGHT, shelf->alignment());
 }
 
 // Makes sure shelf alignment changes are stored, not set, while locked.
 TEST_F(ShelfLockingManagerTest, AlignmentChangesDeferredWhileLocked) {
   Shelf* shelf = Shelf::ForPrimaryDisplay();
-  EXPECT_EQ(SHELF_ALIGNMENT_BOTTOM, shelf->alignment());
+  EXPECT_EQ(wm::SHELF_ALIGNMENT_BOTTOM, shelf->alignment());
 
   SetScreenLocked(true);
-  EXPECT_EQ(SHELF_ALIGNMENT_BOTTOM_LOCKED, shelf->alignment());
-  shelf->SetAlignment(SHELF_ALIGNMENT_RIGHT);
-  EXPECT_EQ(SHELF_ALIGNMENT_BOTTOM_LOCKED, shelf->alignment());
+  EXPECT_EQ(wm::SHELF_ALIGNMENT_BOTTOM_LOCKED, shelf->alignment());
+  shelf->SetAlignment(wm::SHELF_ALIGNMENT_RIGHT);
+  EXPECT_EQ(wm::SHELF_ALIGNMENT_BOTTOM_LOCKED, shelf->alignment());
   SetScreenLocked(false);
-  EXPECT_EQ(SHELF_ALIGNMENT_RIGHT, shelf->alignment());
+  EXPECT_EQ(wm::SHELF_ALIGNMENT_RIGHT, shelf->alignment());
 }
 
 }  // namespace test