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

chrome/browser/profiles/profile_manager_browsertest.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 "base/bind.h"
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/password_manager/password_store_factory.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
@@ skipping 145 matching lines @@
   ProfileRemovalObserver observer;
 
   // We should start out with 1 profile.
   ASSERT_EQ(cache.GetNumberOfProfiles(), 1U);
 
   // Delete singleton profile.
   base::FilePath singleton_profile_path = cache.GetPathOfProfileAtIndex(0);
   EXPECT_FALSE(singleton_profile_path.empty());
   base::RunLoop run_loop;
   profile_manager->ScheduleProfileForDeletion(
-      singleton_profile_path,
+      singleton_profile_path, false /* suppress_profile_creation */,
       base::Bind(&OnUnblockOnProfileCreation, &run_loop));
 
   // Run the message loop until the profile is actually deleted (as indicated
   // by the callback above being called).
   run_loop.Run();
 
   // Make sure a new profile was created automatically.
   EXPECT_EQ(cache.GetNumberOfProfiles(), 1U);
   base::FilePath new_profile_path = cache.GetPathOfProfileAtIndex(0);
   EXPECT_NE(new_profile_path.value(), singleton_profile_path.value());
@@ skipping 27 matching lines @@
   // terminated by OnUnblockOnProfileCreation when the profile is created.
   run_loop.Run();
 
   ASSERT_EQ(cache.GetNumberOfProfiles(), 2U);
 
   // Delete all profiles.
   base::FilePath profile_path1 = cache.GetPathOfProfileAtIndex(0);
   base::FilePath profile_path2 = cache.GetPathOfProfileAtIndex(1);
   EXPECT_FALSE(profile_path1.empty());
   EXPECT_FALSE(profile_path2.empty());
-  profile_manager->ScheduleProfileForDeletion(profile_path1,
-                                              ProfileManager::CreateCallback());
-  profile_manager->ScheduleProfileForDeletion(profile_path2,
-                                              ProfileManager::CreateCallback());
+  profile_manager->ScheduleProfileForDeletion(
+      profile_path1, false /* suppress_profile_creation */,
+      ProfileManager::CreateCallback());
+  profile_manager->ScheduleProfileForDeletion(
+      profile_path2, false /* suppress_profile_creation */,
+      ProfileManager::CreateCallback());
 
   // Spin things so deletion can take place.
   content::RunAllPendingInMessageLoop();
 
   // Make sure a new profile was created automatically.
   EXPECT_EQ(cache.GetNumberOfProfiles(), 1U);
   base::FilePath new_profile_path = cache.GetPathOfProfileAtIndex(0);
   EXPECT_NE(new_profile_path, profile_path1);
   EXPECT_NE(new_profile_path, profile_path2);
 
@@ skipping 220 matching lines @@
 
   password_store->AddLogin(form);
   PasswordStoreConsumerVerifier verify_add;
   password_store->GetAutofillableLogins(&verify_add);
   verify_add.Wait();
   EXPECT_EQ(1u, verify_add.GetPasswords().size());
 
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   base::RunLoop run_loop;
   profile_manager->ScheduleProfileForDeletion(
-      profile->GetPath(), base::Bind(&OnUnblockOnProfileCreation, &run_loop));
+      profile->GetPath(), false /* suppress_profile_creation */,
+      base::Bind(&OnUnblockOnProfileCreation, &run_loop));
   run_loop.Run();
 
   PasswordStoreConsumerVerifier verify_delete;
   password_store->GetAutofillableLogins(&verify_delete);
   verify_delete.Wait();
   EXPECT_EQ(0u, verify_delete.GetPasswords().size());
 }
 #endif  // !defined(OS_WIN) && !defined(OS_ANDROID) && !defined(OS_CHROMEOS)