(Merge to M-51) Fix Chrome OS shelf locking for chromebook lid open/close.

ash/shelf/shelf_layout_manager_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/shelf/shelf_layout_manager.h"
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_table.h"
 #include "ash/ash_switches.h"
 #include "ash/display/display_manager.h"
@@ skipping 360 matching lines @@
     Shell::GetInstance()->OnLockStateChanged(true);
   }
 
   // Turn off the lock screen.
   void UnlockScreen() {
     Shell::GetInstance()->session_state_delegate()->UnlockScreen();
     // The test session state delegate does not fire the lock state change.
     Shell::GetInstance()->OnLockStateChanged(false);
   }
 
-  // Open the add user screen if |show| is true, otherwise end it.
-  void ShowAddUserScreen(bool show) {
-    SetUserAddingScreenRunning(show);
-
-    const SessionStateDelegate::SessionState state =
-        show ? SessionStateDelegate::SESSION_STATE_LOGIN_SECONDARY
-             : SessionStateDelegate::SESSION_STATE_ACTIVE;
-    GetShelfWidget()->shelf_layout_manager()->SessionStateChanged(state);
-    test::ShelfTestAPI(GetShelfWidget()->shelf())
-        .shelf_locking_manager()
-        ->SessionStateChanged(state);
-  }
-
  private:
   DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManagerTest);
 };
 
 void ShelfLayoutManagerTest::RunGestureDragTests(gfx::Vector2d delta) {
   ShelfLayoutManager* shelf = GetShelfLayoutManager();
   shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_NEVER);
   views::Widget* widget = new views::Widget;
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);
   params.bounds = gfx::Rect(0, 0, 200, 200);
@@ skipping 351 matching lines @@
   EXPECT_EQ(shelf_height, display.GetWorkAreaInsets().bottom());
 
   // Make sure the bounds of the two widgets changed.
   shelf_bounds = shelf->GetNativeView()->bounds();
   EXPECT_LT(shelf_bounds.y(), screen->GetPrimaryDisplay().bounds().bottom());
   status_bounds = shelf->status_area_widget()->GetNativeView()->bounds();
   EXPECT_LT(status_bounds.y(),
             screen->GetPrimaryDisplay().bounds().bottom());
 }
 
-// Makes sure shelf alignment is correct for lock screen.
-TEST_F(ShelfLayoutManagerTest, SideAlignmentInteractionWithLockScreen) {
-  ShelfLayoutManager* manager = GetShelfWidget()->shelf_layout_manager();
-  manager->SetAlignment(SHELF_ALIGNMENT_LEFT);
-  EXPECT_EQ(SHELF_ALIGNMENT_LEFT, manager->GetAlignment());
-  LockScreen();
-  EXPECT_EQ(SHELF_ALIGNMENT_BOTTOM_LOCKED, manager->GetAlignment());
-  UnlockScreen();
-  EXPECT_EQ(SHELF_ALIGNMENT_LEFT, manager->GetAlignment());
-}
-
-// Makes sure shelf alignment is correct for add user screen.
-TEST_F(ShelfLayoutManagerTest, SideAlignmentInteractionWithAddUserScreen) {
-  ShelfLayoutManager* manager = GetShelfWidget()->shelf_layout_manager();
-  manager->SetAlignment(SHELF_ALIGNMENT_LEFT);
-  EXPECT_EQ(SHELF_ALIGNMENT_LEFT, manager->GetAlignment());
-  ShowAddUserScreen(true);
-  EXPECT_EQ(SHELF_ALIGNMENT_BOTTOM_LOCKED, manager->GetAlignment());
-  ShowAddUserScreen(false);
-  EXPECT_EQ(SHELF_ALIGNMENT_LEFT, manager->GetAlignment());
-}
-
-// Makes sure shelf alignment is correct for login screen.
-TEST_F(ShelfLayoutManagerTest, SideAlignmentInteractionWithLoginScreen) {
-  ShelfLayoutManager* manager = GetShelfWidget()->shelf_layout_manager();
-  ASSERT_EQ(SHELF_ALIGNMENT_BOTTOM, manager->GetAlignment());
-  SetUserLoggedIn(false);
-  SetSessionStarted(false);
-
-  // The test session state delegate does not fire state changes.
-  SetSessionStarting();
-  manager->SessionStateChanged(
-      Shell::GetInstance()->session_state_delegate()->GetSessionState());
-
-  // Login sets alignment preferences before the session completes startup.
-  manager->SetAlignment(SHELF_ALIGNMENT_LEFT);
-  SetUserLoggedIn(true);
-  SetSessionStarted(true);
-
-  EXPECT_EQ(SHELF_ALIGNMENT_LEFT, manager->GetAlignment());
-  // Ensure that the shelf has been notified.
-  EXPECT_EQ(SHELF_ALIGNMENT_LEFT, GetShelfWidget()->shelf()->alignment());
-}
-
 // Makes sure LayoutShelf invoked while animating cleans things up.
 TEST_F(ShelfLayoutManagerTest, LayoutShelfWhileAnimating) {
   ShelfWidget* shelf = GetShelfWidget();
   // Force an initial layout.
   shelf->shelf_layout_manager()->LayoutShelf();
   EXPECT_EQ(SHELF_VISIBLE, shelf->shelf_layout_manager()->visibility_state());
 
   // Hide the shelf.
   SetState(shelf->shelf_layout_manager(), SHELF_HIDDEN);
   shelf->shelf_layout_manager()->LayoutShelf();
@@ skipping 1517 matching lines @@
   StatusAreaWidget* status_area_widget =
       Shell::GetPrimaryRootWindowController()->shelf()->status_area_widget();
   EXPECT_TRUE(status_area_widget->IsVisible());
   // Shelf should be in the first display's area.
   gfx::Rect status_area_bounds(status_area_widget->GetWindowBoundsInScreen());
   EXPECT_TRUE(gfx::Rect(0, 0, 500, 400).Contains(status_area_bounds));
   EXPECT_EQ(gfx::Point(500, 400), status_area_bounds.bottom_right());
 }
 
 }  // namespace ash