cros: Tighten profile loading

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 302 matching lines @@
   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));
+
+  // GetLastUsedProfile() after login but before a user profile is loaded is
+  // fatal.
+  EXPECT_DEATH_IF_SUPPORTED(ProfileManager::GetLastUsedProfile(), ".*");
 
   // 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));
@@ skipping 1169 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)