mash: Migrate ShelfLockingManager to ash/common.

ash/common/shelf/shelf_locking_manager_unittest.cc

 // Copyright 2016 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_locking_manager.h"
+#include "ash/common/shelf/shelf_locking_manager.h"
 
 #include "ash/common/session/session_state_delegate.h"
-#include "ash/shelf/shelf.h"
+#include "ash/common/shelf/wm_shelf.h"
 #include "ash/test/ash_test_base.h"
-#include "ash/test/shelf_test_api.h"
 
 namespace ash {
 namespace test {
 
 // Tests the shelf behavior when the screen or session is locked.
 class ShelfLockingManagerTest : public ash::test::AshTestBase {
  public:
   ShelfLockingManagerTest() {}
 
   ShelfLockingManager* GetShelfLockingManager() {
-    return ShelfTestAPI(Shelf::ForPrimaryDisplay()).shelf_locking_manager();
+    return GetPrimaryShelf()->GetShelfLockingManagerForTesting();
   }
 
   void SetScreenLocked(bool locked) {
     GetShelfLockingManager()->OnLockStateChanged(locked);
   }
 
   void SetSessionState(SessionStateDelegate::SessionState state) {
     GetShelfLockingManager()->SessionStateChanged(state);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ShelfLockingManagerTest);
 };
 
 // Makes sure shelf alignment is correct for lock screen.
 TEST_F(ShelfLockingManagerTest, AlignmentLockedWhileScreenLocked) {
-  Shelf* shelf = Shelf::ForPrimaryDisplay();
-  EXPECT_EQ(SHELF_ALIGNMENT_BOTTOM, shelf->alignment());
+  WmShelf* shelf = GetPrimaryShelf();
+  EXPECT_EQ(SHELF_ALIGNMENT_BOTTOM, shelf->GetAlignment());
 
   shelf->SetAlignment(SHELF_ALIGNMENT_LEFT);
-  EXPECT_EQ(SHELF_ALIGNMENT_LEFT, shelf->alignment());
+  EXPECT_EQ(SHELF_ALIGNMENT_LEFT, shelf->GetAlignment());
 
   SetScreenLocked(true);
-  EXPECT_EQ(SHELF_ALIGNMENT_BOTTOM_LOCKED, shelf->alignment());
+  EXPECT_EQ(SHELF_ALIGNMENT_BOTTOM_LOCKED, shelf->GetAlignment());
   SetScreenLocked(false);
-  EXPECT_EQ(SHELF_ALIGNMENT_LEFT, shelf->alignment());
+  EXPECT_EQ(SHELF_ALIGNMENT_LEFT, shelf->GetAlignment());
 }
 
 // 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());
+  WmShelf* shelf = GetPrimaryShelf();
+  EXPECT_EQ(SHELF_ALIGNMENT_BOTTOM, shelf->GetAlignment());
 
   shelf->SetAlignment(SHELF_ALIGNMENT_RIGHT);
-  EXPECT_EQ(SHELF_ALIGNMENT_RIGHT, shelf->alignment());
+  EXPECT_EQ(SHELF_ALIGNMENT_RIGHT, shelf->GetAlignment());
 
   SetSessionState(SessionStateDelegate::SESSION_STATE_LOGIN_PRIMARY);
-  EXPECT_EQ(SHELF_ALIGNMENT_BOTTOM_LOCKED, shelf->alignment());
+  EXPECT_EQ(SHELF_ALIGNMENT_BOTTOM_LOCKED, shelf->GetAlignment());
   SetSessionState(SessionStateDelegate::SESSION_STATE_ACTIVE);
-  EXPECT_EQ(SHELF_ALIGNMENT_RIGHT, shelf->alignment());
+  EXPECT_EQ(SHELF_ALIGNMENT_RIGHT, shelf->GetAlignment());
 
   SetSessionState(SessionStateDelegate::SESSION_STATE_LOGIN_SECONDARY);
-  EXPECT_EQ(SHELF_ALIGNMENT_BOTTOM_LOCKED, shelf->alignment());
+  EXPECT_EQ(SHELF_ALIGNMENT_BOTTOM_LOCKED, shelf->GetAlignment());
   SetSessionState(SessionStateDelegate::SESSION_STATE_ACTIVE);
-  EXPECT_EQ(SHELF_ALIGNMENT_RIGHT, shelf->alignment());
+  EXPECT_EQ(SHELF_ALIGNMENT_RIGHT, shelf->GetAlignment());
 }
 
 // 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());
+  WmShelf* shelf = GetPrimaryShelf();
+  EXPECT_EQ(SHELF_ALIGNMENT_BOTTOM, shelf->GetAlignment());
 
   SetScreenLocked(true);
-  EXPECT_EQ(SHELF_ALIGNMENT_BOTTOM_LOCKED, shelf->alignment());
+  EXPECT_EQ(SHELF_ALIGNMENT_BOTTOM_LOCKED, shelf->GetAlignment());
   shelf->SetAlignment(SHELF_ALIGNMENT_RIGHT);
-  EXPECT_EQ(SHELF_ALIGNMENT_BOTTOM_LOCKED, shelf->alignment());
+  EXPECT_EQ(SHELF_ALIGNMENT_BOTTOM_LOCKED, shelf->GetAlignment());
   SetScreenLocked(false);
-  EXPECT_EQ(SHELF_ALIGNMENT_RIGHT, shelf->alignment());
+  EXPECT_EQ(SHELF_ALIGNMENT_RIGHT, shelf->GetAlignment());
 }
 
 }  // namespace test
 }  // namespace ash

[James Cook, 2016/07/20 21:14:30]

woo hoo, you were able to convert the test!

[msw, 2016/07/20 21:21:14]

Acknowledged.