Update last used profile when deleting profile

chrome/browser/profiles/profile_manager.cc

 // Copyright (c) 2011 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 <set>
 
 #include "chrome/browser/profiles/profile_manager.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
@@ skipping 625 matching lines @@
   // place.
   ProfileInfoCache& cache = GetProfileInfoCache();
   if (cache.GetNumberOfProfiles() == 1) {
     FilePath new_path = GenerateNextProfileDirectoryPath();
 
     // The launcher is deleted by the manager when profile creation is finished.
     NewProfileLauncher* launcher = new NewProfileLauncher();
     CreateProfileAsync(new_path, launcher);
   }
 
+  // Update the last used profile pref before closing browser windows. This way
+  // the correct last used profile is set for any notification observers.
+  PrefService* local_state = g_browser_process->local_state();
+  std::string last_profile = local_state->GetString(prefs::kProfileLastUsed);
+  if (profile_dir.BaseName().MaybeAsASCII() == last_profile) {
+    for (size_t i = 0; i < cache.GetNumberOfProfiles(); ++i) {
+      FilePath cur_path = cache.GetPathOfProfileAtIndex(i);
+      if (cur_path != profile_dir) {
+        local_state->SetString(
+            prefs::kProfileLastUsed, cur_path.BaseName().MaybeAsASCII());
+        break;
+      }
+    }
+  }
+
   // TODO(sail): Due to bug 88586 we don't delete the profile instance. Once we
   // start deleting the profile instance we need to close background apps too.
   Profile* profile = GetProfileByPath(profile_dir);
   if (profile)
     BrowserList::CloseAllBrowsersWithProfile(profile);
+
   QueueProfileDirectoryForDeletion(profile_dir);
   cache.DeleteProfileFromCache(profile_dir);
 }
 
 // static
 bool ProfileManager::IsMultipleProfilesEnabled() {
 #if defined(OS_CHROMEOS)
   return CommandLine::ForCurrentProcess()->HasSwitch(switches::kMultiProfiles);
 #else
   return true;
@@ skipping 16 matching lines @@
 ProfileManagerWithoutInit::ProfileManagerWithoutInit(
     const FilePath& user_data_dir) : ProfileManager(user_data_dir) {
 }
 
 void ProfileManager::RegisterTestingProfile(Profile* profile,
                                             bool add_to_cache) {
   RegisterProfile(profile, true);
   if (add_to_cache)
     AddProfileToCache(profile);
 }