Profile deletion: forbid fallback to guest profile.

chrome/browser/profiles/profile_manager.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 "chrome/browser/profiles/profile_manager.h"
 
 #include <stdint.h>
 
 #include <map>
 #include <set>
@@ skipping 1298 matching lines @@
   }
   return profile;
 }
 
 #if !defined(OS_ANDROID)
 void ProfileManager::EnsureActiveProfileExistsBeforeDeletion(
     const CreateCallback& callback, const base::FilePath& profile_dir) {
   // In case we delete non-active profile, just proceed.
   const base::FilePath last_used_profile =
       GetLastUsedProfileDir(user_data_dir_);
+  const base::FilePath guest_profile_path = GetGuestProfilePath();
   if (last_used_profile != profile_dir &&
-      last_used_profile != GetGuestProfilePath()) {
+      last_used_profile != guest_profile_path) {
     FinishDeletingProfile(profile_dir, last_used_profile);
     return;
   }
 
   // Search for an active browser and use its profile as active if possible.
   for (Browser* browser : *BrowserList::GetInstance()) {
     Profile* profile = browser->profile();
     base::FilePath cur_path = profile->GetPath();
     if (cur_path != profile_dir &&
+        cur_path != guest_profile_path &&
         !profile->IsLegacySupervised() &&
         !IsProfileDirectoryMarkedForDeletion(cur_path)) {
       OnNewActiveProfileLoaded(profile_dir, cur_path, callback, profile,
                                Profile::CREATE_STATUS_INITIALIZED);
       return;
     }
   }
 
   // There no valid browsers to fallback, search for any existing valid profile.
   ProfileAttributesStorage& storage = GetProfileAttributesStorage();
   base::FilePath fallback_profile_path;
   std::vector<ProfileAttributesEntry*> entries =
       storage.GetAllProfilesAttributes();
   for (ProfileAttributesEntry* entry : entries) {
     base::FilePath cur_path = entry->GetPath();
     // Make sure that this profile is not pending deletion, and is not
     // legacy-supervised.
     if (cur_path != profile_dir &&
+        cur_path != guest_profile_path &&
         !entry->IsLegacySupervised() &&
         !IsProfileDirectoryMarkedForDeletion(cur_path)) {
       fallback_profile_path = cur_path;
       break;
     }
   }
 
   // If we're deleting the last (non-legacy-supervised) profile, then create a
   // new profile in its place. Load existing profile otherwise.
   std::string new_avatar_url;
@@ skipping 306 matching lines @@
 
   FinishDeletingProfile(profile_to_delete_path, new_active_profile_path);
   if (!original_callback.is_null())
     original_callback.Run(loaded_profile, status);
 }
 #endif  // !defined(OS_ANDROID)
 
 ProfileManagerWithoutInit::ProfileManagerWithoutInit(
     const base::FilePath& user_data_dir) : ProfileManager(user_data_dir) {
 }