Properly set ShelfAlignment during login

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_controller.h"
@@ skipping 362 matching lines @@
 
   // 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);
     ShelfLayoutManager* manager = GetShelfWidget()->shelf_layout_manager();
     manager->SessionStateChanged(
         show ? SessionStateDelegate::SESSION_STATE_LOGIN_SECONDARY :
                SessionStateDelegate::SESSION_STATE_ACTIVE);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManagerTest);
 };
 
@@ skipping 379 matching lines @@
 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, 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 1368 matching lines @@
   shelf_manager->SetAutoHideBehavior(SHELF_AUTO_HIDE_ALWAYS_HIDDEN);
   gfx::Rect hide_target_bounds =  status_window->GetTargetBounds();
   EXPECT_GT(hide_target_bounds.y(), initial_bounds.y());
 
   shelf_manager->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_NEVER);
   gfx::Rect reshow_target_bounds = status_window->GetTargetBounds();
   EXPECT_EQ(initial_bounds, reshow_target_bounds);
 }
 
 }  // namespace ash