Don't create a new profile when cleaning up stale ephemeral profiles.

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 <string>
 
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/run_loop.h"
@@ skipping 858 matching lines @@
       content::NotificationService::NoDetails());
   browser1.reset();
   browser2.reset();
   browser3.reset();
 
   last_opened_profiles = profile_manager->GetLastOpenedProfiles();
   ASSERT_EQ(1U, last_opened_profiles.size());
   EXPECT_EQ(normal_profile, last_opened_profiles[0]);
 }
 
+TEST_F(ProfileManagerTest, CleanUpEphemeralProfiles) {
+  // Create two profiles, one of them ephemeral.
+  ProfileManager* profile_manager = g_browser_process->profile_manager();
+  ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();
+  ASSERT_EQ(0u, cache.GetNumberOfProfiles());
+
+  const std::string profile_name1 = "Homer";
+  base::FilePath path1 = temp_dir_.path().AppendASCII(profile_name1);
+  cache.AddProfileToCache(path1, base::UTF8ToUTF16(profile_name1),
+                          std::string(), base::UTF8ToUTF16(profile_name1), 0,
+                          std::string());
+  cache.SetProfileIsEphemeralAtIndex(0, true);
+  ASSERT_TRUE(base::CreateDirectory(path1));
+
+  const std::string profile_name2 = "Marge";
+  base::FilePath path2 = temp_dir_.path().AppendASCII(profile_name2);
+  cache.AddProfileToCache(path2, base::UTF8ToUTF16(profile_name2),
+                          std::string(), base::UTF8ToUTF16(profile_name2), 0,
+                          std::string());
+  ASSERT_EQ(2u, cache.GetNumberOfProfiles());
+  ASSERT_TRUE(base::CreateDirectory(path2));
+
+  // Set the active profile.
+  PrefService* local_state = g_browser_process->local_state();
+  local_state->SetString(prefs::kProfileLastUsed, profile_name1);
+
+  profile_manager->CleanUpEphemeralProfiles();
+  base::RunLoop().RunUntilIdle();
+
+  // The ephemeral profile should be deleted, and the last used profile set to
+  // the other one.
+  EXPECT_FALSE(base::DirectoryExists(path1));
+  EXPECT_TRUE(base::DirectoryExists(path2));
+  EXPECT_EQ(profile_name2, local_state->GetString(prefs::kProfileLastUsed));
+  ASSERT_EQ(1u, cache.GetNumberOfProfiles());
+
+  // Mark the remaining profile ephemeral and clean up.
+  cache.SetProfileIsEphemeralAtIndex(0, true);
+  profile_manager->CleanUpEphemeralProfiles();
+  base::RunLoop().RunUntilIdle();
+
+  // The profile should be deleted, and the last used profile set to a new one.
+  EXPECT_FALSE(base::DirectoryExists(path2));
+  EXPECT_EQ(0u, cache.GetNumberOfProfiles());
+  EXPECT_EQ("Profile 1", local_state->GetString(prefs::kProfileLastUsed));
+}
+
 TEST_F(ProfileManagerTest, ActiveProfileDeleted) {
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   ASSERT_TRUE(profile_manager);
 
   // Create and load two profiles.
   const std::string profile_name1 = "New Profile 1";
   const std::string profile_name2 = "New Profile 2";
   base::FilePath dest_path1 = temp_dir_.path().AppendASCII(profile_name1);
   base::FilePath dest_path2 = temp_dir_.path().AppendASCII(profile_name2);
 
@@ skipping 418 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)