Merge "cros: Move wallpaper after login screen is gone"

ash/session/session_controller_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/session/session_controller.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 168 matching lines @@
 
 // Tests that session state can be set and reflected properly.
 TEST_F(SessionControllerTest, SessionState) {
   const struct {
     SessionState state;
     bool expected_is_screen_locked;
     bool expected_is_user_session_blocked;
   } kTestCases[] = {
       {SessionState::OOBE, false, true},
       {SessionState::LOGIN_PRIMARY, false, true},
-      {SessionState::LOGGED_IN_NOT_ACTIVE, false, true},
+      {SessionState::LOGGED_IN_NOT_ACTIVE, false, false},
       {SessionState::ACTIVE, false, false},
       {SessionState::LOCKED, true, true},
       {SessionState::LOGIN_SECONDARY, false, true},
   };
 
   mojom::SessionInfo info;
   FillDefaultSessionInfo(&info);
   for (const auto& test_case : kTestCases) {
     info.state = test_case.state;
     SetSessionInfo(info);
@@ skipping 126 matching lines @@
   // Mark a running unlock animation unblocks user session.
   controller()->RunUnlockAnimation(base::Closure());
   EXPECT_FALSE(controller()->IsUserSessionBlocked());
 
   const struct {
     SessionState state;
     bool expected_is_user_session_blocked;
   } kTestCases[] = {
       {SessionState::OOBE, true},
       {SessionState::LOGIN_PRIMARY, true},
-      {SessionState::LOGGED_IN_NOT_ACTIVE, true},
+      {SessionState::LOGGED_IN_NOT_ACTIVE, false},
       {SessionState::ACTIVE, false},
       {SessionState::LOGIN_SECONDARY, true},
   };
   for (const auto& test_case : kTestCases) {
     info.state = test_case.state;
     SetSessionInfo(info);
 
     // Mark a running unlock animation.
     controller()->RunUnlockAnimation(base::Closure());
 
     EXPECT_EQ(test_case.expected_is_user_session_blocked,
               controller()->IsUserSessionBlocked())
         << "Test case state=" << static_cast<int>(test_case.state);
   }
 }
 
 }  // namespace
 }  // namespace ash