cros: Fix loading user profile w/o UserSessionManager

chrome/browser/profiles/profile_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 <stddef.h>
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 272 matching lines @@
       content::Details<const user_manager::User>(active_user));
   base::FilePath expected_logged_in(
       chromeos::ProfileHelper::GetUserProfileDir(active_user->username_hash()));
   EXPECT_EQ(expected_logged_in.value(),
             profile_manager->GetInitialProfileDir().value());
   VLOG(1) << temp_dir_.GetPath()
                  .Append(profile_manager->GetInitialProfileDir())
                  .value();
 }
 
+// Test Get[ActiveUser|PrimaryUser|LastUsed]Profile does not load user profile.
+TEST_F(ProfileManagerTest, UserProfileLoading) {
+  using chromeos::ProfileHelper;
+
+  Profile* const signin_profile = ProfileHelper::GetSigninProfile();
+
+  // Get[Active|Primary|LastUsed]Profile return the sign-in profile before login
+  // happens. IsSameProfile() is used to properly test against TestProfile whose
+  // otr version uses a different temp path.

[msarda, 2017/06/08 23:49:19]

Maybe s/otr/OTR?

[xiyuan, 2017/06/12 15:32:54]

Done.

+  EXPECT_TRUE(
+      ProfileManager::GetActiveUserProfile()->IsSameProfile(signin_profile));
+  EXPECT_TRUE(
+      ProfileManager::GetPrimaryUserProfile()->IsSameProfile(signin_profile));
+  EXPECT_TRUE(
+      ProfileManager::GetLastUsedProfile()->IsSameProfile(signin_profile));
+
+  // User signs in but user profile loading has not started.
+  const std::string user_id = "test-user@example.com";
+  const std::string user_id_hash =
+      ProfileHelper::Get()->GetUserIdHashByUserIdForTesting(user_id);
+  user_manager::UserManager::Get()->UserLoggedIn(
+      AccountId::FromUserEmail(user_id), user_id_hash, false);
+
+  // Sign-in profile should be returned at this stage. Otherwise, login code
+  // ends up in an invalid state. Strange things as in http://crbug.com/728683
+  // and http://crbug.com/718734 happens.
+  EXPECT_TRUE(
+      ProfileManager::GetActiveUserProfile()->IsSameProfile(signin_profile));
+  EXPECT_TRUE(
+      ProfileManager::GetPrimaryUserProfile()->IsSameProfile(signin_profile));
+  EXPECT_TRUE(
+      ProfileManager::GetLastUsedProfile()->IsSameProfile(signin_profile));
+
+  // Simulate UserSessionManager loads the profile.
+  Profile* const user_profile =
+      g_browser_process->profile_manager()->GetProfile(
+          ProfileHelper::Get()->GetProfilePathByUserIdHash(user_id_hash));
+  ASSERT_FALSE(user_profile->IsSameProfile(signin_profile));
+
+  // User profile is returned thereafter.
+  EXPECT_TRUE(
+      ProfileManager::GetActiveUserProfile()->IsSameProfile(user_profile));
+  EXPECT_TRUE(
+      ProfileManager::GetPrimaryUserProfile()->IsSameProfile(user_profile));
+  EXPECT_TRUE(
+      ProfileManager::GetLastUsedProfile()->IsSameProfile(user_profile));
+}
+
 #endif
 
 TEST_F(ProfileManagerTest, CreateAndUseTwoProfiles) {
   base::FilePath dest_path1 = temp_dir_.GetPath();
   dest_path1 = dest_path1.Append(FILE_PATH_LITERAL("New Profile 1"));
 
   base::FilePath dest_path2 = temp_dir_.GetPath();
   dest_path2 = dest_path2.Append(FILE_PATH_LITERAL("New Profile 2"));
 
   ProfileManager* profile_manager = g_browser_process->profile_manager();
@@ skipping 367 matching lines @@
   // Check if the profile prefs are the same as the cache prefs
   EXPECT_EQ(profile_name, base::UTF16ToUTF8(entry->GetName()));
   EXPECT_EQ(avatar_index, entry->GetAvatarIconIndex());
 }
 
 TEST_F(ProfileManagerTest, GetLastUsedProfileAllowedByPolicy) {
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   ASSERT_TRUE(profile_manager);
 
 #if defined(OS_CHROMEOS)
-  // On CrOS, profile returned by GetLastUsedProfile is a singin profile that
+  // On CrOS, profile returned by GetLastUsedProfile is a sign-in profile that
   // is forced to be incognito. That's why we need to create at least one user
   // to get a regular profile.
   RegisterUser("test-user@example.com");
 #endif
 
   Profile* profile = profile_manager->GetLastUsedProfileAllowedByPolicy();
   ASSERT_TRUE(profile);
   EXPECT_FALSE(profile->IsOffTheRecord());
   PrefService* prefs = profile->GetPrefs();
   EXPECT_EQ(IncognitoModePrefs::ENABLED,
@@ skipping 765 matching lines @@
                          dest_path2.BaseName().MaybeAsASCII());
   profile_manager->ScheduleProfileForDeletion(dest_path2,
                                               ProfileManager::CreateCallback());
   // Spin the message loop so that all the callbacks can finish running.
   base::RunLoop().RunUntilIdle();
 
   EXPECT_EQ(dest_path3, profile_manager->GetLastUsedProfile()->GetPath());
   EXPECT_EQ(profile_name3, local_state->GetString(prefs::kProfileLastUsed));
 }
 #endif  // !defined(OS_MACOSX)