cros: Defer primary user meta update until active

chrome/browser/ui/ash/session_controller_client_unittest.cc

 // Copyright 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 "chrome/browser/ui/ash/session_controller_client.h"
 
 #include <memory>
 #include <string>
 #include <vector>
 
@@ skipping 14 matching lines @@
 #include "components/session_manager/core/session_manager.h"
 #include "components/signin/core/account_id/account_id.h"
 #include "components/user_manager/user_manager.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "net/cert/x509_certificate.h"
 #include "net/test/cert_test_util.h"
 #include "net/test/test_data_directory.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using chromeos::FakeChromeUserManager;
+using session_manager::SessionState;
 
 namespace {
 
 const char* kUser = "user@test.com";
 
 // Weak ptr to PolicyCertVerifier - object is freed in test destructor once
 // we've ensured the profile has been shut down.
 policy::PolicyCertVerifier* g_policy_cert_verifier_for_factory = nullptr;
 
 std::unique_ptr<KeyedService> CreateTestPolicyCertService(
@@ skipping 330 matching lines @@
 
   // No user session sent yet.
   EXPECT_EQ(0, session_controller.update_user_session_count());
 
   // Simulate login.
   const AccountId account_id(AccountId::FromUserEmail("user@test.com"));
   user_manager()->AddUser(account_id);
   session_manager_.CreateSession(
       account_id, chromeos::ProfileHelper::GetUserIdHashByUserIdForTesting(
                       "user@test.com"));
+  session_manager_.SetSessionState(SessionState::ACTIVE);
   SessionControllerClient::FlushForTesting();
 
   // User session was sent.
   EXPECT_EQ(1, session_controller.update_user_session_count());
 
   // Simulate a request for an update where nothing changed.
   client.SendUserSession(*user_manager()->GetLoggedInUsers()[0]);
   SessionControllerClient::FlushForTesting();
 
   // Session was not updated because nothing changed.
   EXPECT_EQ(1, session_controller.update_user_session_count());
 }
 
 TEST_F(SessionControllerClientTest, SupervisedUser) {
   // Create an object to test and connect it to our test interface.
   SessionControllerClient client;
   TestSessionController session_controller;
   client.session_controller_ = session_controller.CreateInterfacePtrAndBind();
   client.Init();
   SessionControllerClient::FlushForTesting();
 
   // Simulate the login screen. No user session yet.
-  session_manager_.SetSessionState(
-      session_manager::SessionState::LOGIN_PRIMARY);
+  session_manager_.SetSessionState(SessionState::LOGIN_PRIMARY);
   EXPECT_FALSE(session_controller.last_user_session());
 
   // Simulate a supervised user logging in.
   const AccountId account_id(AccountId::FromUserEmail("child@test.com"));
   const user_manager::User* user =
       user_manager()->AddSupervisedUser(account_id);
   ASSERT_TRUE(user);
 
   // Start session. This logs in the user and sends an active user notification.
   // The hash must match the one used by FakeChromeUserManager.
   session_manager_.CreateSession(
       account_id, chromeos::ProfileHelper::GetUserIdHashByUserIdForTesting(
                       "child@test.com"));
+  session_manager_.SetSessionState(SessionState::ACTIVE);
   SessionControllerClient::FlushForTesting();
 
   // The session controller received session info and user session.
   EXPECT_LT(0u, session_controller.last_user_session()->session_id);
   EXPECT_EQ(user_manager::USER_TYPE_SUPERVISED,
             session_controller.last_user_session()->type);
 
   // Simulate profile creation after login.
   CreateTestingProfile(user);
   user_profile_->SetSupervisedUserId("child-id");
@@ skipping 16 matching lines @@
 
   // Simulate an update to the custodian information.
   prefs->SetString(prefs::kSupervisedUserCustodianEmail, "parent3@test.com");
   client.OnCustodianInfoChanged();
   SessionControllerClient::FlushForTesting();
 
   // The updated custodian was sent over the mojo interface.
   EXPECT_EQ("parent3@test.com",
             session_controller.last_user_session()->custodian_email);
 }