Revert "chromeos: Fix shelf appearing at login screen under mash"

ash/common/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/common/test/test_session_state_delegate.h"
 
 #include <algorithm>
 #include <string>
 
 #include "ash/common/login_status.h"
@@ skipping 143 matching lines @@
          user_adding_screen_running_ ||
          session_state_ != session_manager::SessionState::ACTIVE;
 }
 
 session_manager::SessionState TestSessionStateDelegate::GetSessionState()
     const {
   return session_state_;
 }
 
 void TestSessionStateDelegate::SetHasActiveUser(bool has_active_user) {
-  session_state_ = has_active_user
-                       ? session_manager::SessionState::ACTIVE
-                       : session_manager::SessionState::LOGIN_PRIMARY;
+  if (!has_active_user) {
+    session_state_ = session_manager::SessionState::LOGIN_PRIMARY;
+  } else {
+    session_state_ = session_manager::SessionState::ACTIVE;
+    WmShell::Get()->ShowShelf();
+  }
 }
 
 void TestSessionStateDelegate::SetActiveUserSessionStarted(
     bool active_user_session_started) {
   if (active_user_session_started) {
     user_manager_->SessionStarted();
     session_state_ = session_manager::SessionState::ACTIVE;
     WmShell::Get()->CreateShelf();
     WmShell::Get()->UpdateAfterLoginStatusChange(LoginStatus::USER);
   } else {
@@ skipping 67 matching lines @@
 }
 
 void TestSessionStateDelegate::AddSessionStateObserver(
     SessionStateObserver* observer) {}
 
 void TestSessionStateDelegate::RemoveSessionStateObserver(
     SessionStateObserver* observer) {}
 
 }  // namespace test
 }  // namespace ash