Properly set ShelfAlignment during login

ash/test/test_session_state_delegate.cc

 // Copyright (c) 2013 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/test/test_session_state_delegate.h"
 
 #include <algorithm>
 #include <string>
 
 #include "ash/shell.h"
@@ skipping 52 matching lines @@
 };
 
 TestSessionStateDelegate::TestSessionStateDelegate()
     : has_active_user_(false),
       active_user_session_started_(false),
       can_lock_screen_(true),
       should_lock_screen_before_suspending_(false),
       screen_locked_(false),
       user_adding_screen_running_(false),
       logged_in_users_(1),
-      active_user_index_(0) {
+      active_user_index_(0),
+      session_state_(SESSION_STATE_LOGIN_PRIMARY) {
   user_list_.push_back(
       new MockUserInfo("First@tray"));  // This is intended to be capitalized.
   user_list_.push_back(
       new MockUserInfo("Second@tray"));  // This is intended to be capitalized.
   user_list_.push_back(new MockUserInfo("third@tray"));
   user_list_.push_back(new MockUserInfo("someone@tray"));
 }
 
 TestSessionStateDelegate::~TestSessionStateDelegate() {
   STLDeleteElements(&user_list_);
@@ skipping 54 matching lines @@
   screen_locked_ = false;
 }
 
 bool TestSessionStateDelegate::IsUserSessionBlocked() const {
   return !IsActiveUserSessionStarted() || IsScreenLocked() ||
       user_adding_screen_running_;
 }
 
 SessionStateDelegate::SessionState TestSessionStateDelegate::GetSessionState()
     const {
-  if (user_adding_screen_running_)
-    return SESSION_STATE_LOGIN_SECONDARY;
-
-  // Assuming that if session is not active we're at login.
-  return IsActiveUserSessionStarted() ?
-      SESSION_STATE_ACTIVE : SESSION_STATE_LOGIN_PRIMARY;
+  return session_state_;
 }
 
 void TestSessionStateDelegate::SetHasActiveUser(bool has_active_user) {
   has_active_user_ = has_active_user;
-  if (!has_active_user)
+  if (!has_active_user) {
     active_user_session_started_ = false;
-  else
+    session_state_ = SESSION_STATE_LOGIN_PRIMARY;
+  } else {
     Shell::GetInstance()->ShowShelf();
+  }
 }
 
 void TestSessionStateDelegate::SetActiveUserSessionStarted(
     bool active_user_session_started) {
   active_user_session_started_ = active_user_session_started;
   if (active_user_session_started) {
+    session_state_ = SESSION_STATE_ACTIVE;
     has_active_user_ = true;
     Shell::GetInstance()->CreateShelf();
     Shell::GetInstance()->UpdateAfterLoginStatusChange(
         user::LOGGED_IN_USER);
+  } else {
+    session_state_ = SESSION_STATE_LOGIN_PRIMARY;
   }
 }
 
 void TestSessionStateDelegate::SetCanLockScreen(bool can_lock_screen) {
   can_lock_screen_ = can_lock_screen;
 }
 
 void TestSessionStateDelegate::SetShouldLockScreenBeforeSuspending(
     bool should_lock) {
   should_lock_screen_before_suspending_ = should_lock;
 }
 
 void TestSessionStateDelegate::SetUserAddingScreenRunning(
     bool user_adding_screen_running) {
   user_adding_screen_running_ = user_adding_screen_running;
+  if (user_adding_screen_running_)
+    session_state_ = SESSION_STATE_LOGIN_SECONDARY;
 }
 
 void TestSessionStateDelegate::SetUserImage(
     const gfx::ImageSkia& user_image) {
   user_list_[active_user_index_]->SetUserImage(user_image);
 }
 
+void TestSessionStateDelegate::SetSessionState(SessionState session_state) {
+  session_state_ = session_state;
+}
+
 const user_manager::UserInfo* TestSessionStateDelegate::GetUserInfo(
     MultiProfileIndex index) const {
   int max = static_cast<int>(user_list_.size());
   return user_list_[index < max ? index : max - 1];
 }
 
 const user_manager::UserInfo* TestSessionStateDelegate::GetUserInfo(
     content::BrowserContext* context) const {
   return user_list_[active_user_index_];
 }
@@ skipping 29 matching lines @@
 void TestSessionStateDelegate::AddSessionStateObserver(
     SessionStateObserver* observer) {
 }
 
 void TestSessionStateDelegate::RemoveSessionStateObserver(
     SessionStateObserver* observer) {
 }
 
 }  // namespace test
 }  // namespace ash