Nicely handle OnBeforeUnloads with guest and lock mode.

chrome/browser/profiles/profile_window.cc

Index: chrome/browser/profiles/profile_window.cc
diff --git a/chrome/browser/profiles/profile_window.cc b/chrome/browser/profiles/profile_window.cc
index 10b48e19cd03d7fa56cab89d3d442126198abc31..3a12a1fea43d000cc6d56ef3d244dc8243af38a3 100644
--- a/chrome/browser/profiles/profile_window.cc
+++ b/chrome/browser/profiles/profile_window.cc
@@ -259,25 +259,38 @@ void CreateAndSwitchToNewProfile(chrome::HostDesktopType desktop_type,
   ProfileMetrics::LogProfileAddNewUser(metric);
 }
 
+void GuestBrowserCloseSuccess(const size_t profile_index) {

[noms (inactive), 2014/08/26 20:17:32]

I don't think you need the profile_index as an argument if you're not using it.
Also, can you just use base::Bind(&chrome::ShowUserManager) instead? I don't
think anyone else calls GuestBrowserCloseSuccess...

If not, ShowUserManagerMaybeWithTutorial(null) is also an option. I don't think
you need to define this function just to call ShowUserManager

[Mike Lerman, 2014/08/27 14:11:38]

The on_close_confirmed parameter of CloseAllBrowsersWithProfile needs to take a
function of signature void(size_t), which is necessary for
LockBrowserCloseSuccess. Neither of the method you've mentioned that will
directly create the UserManager have that signature, so I think I need to make a
method here that matches.

+  chrome::ShowUserManager(base::FilePath());
+}
+
 void CloseGuestProfileWindows() {
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   Profile* profile = profile_manager->GetProfileByPath(
       ProfileManager::GetGuestProfilePath());
 
   if (profile) {
-    BrowserList::CloseAllBrowsersWithProfile(profile);
+    BrowserList::CloseAllBrowsersWithProfile(profile,
+        base::Bind(&GuestBrowserCloseSuccess),
+        base::Bind(&BrowserList::DoNothing));
   }
 }
 
-void LockProfile(Profile* profile) {
-  DCHECK(profile);
+void LockBrowserCloseSuccess(const size_t profile_index) {
   ProfileInfoCache& cache =
       g_browser_process->profile_manager()->GetProfileInfoCache();
+  DCHECK_LT(profile_index, cache.GetNumberOfProfiles());
+
+  cache.SetProfileSigninRequiredAtIndex(profile_index, true);
+  chrome::ShowUserManager(cache.GetPathOfProfileAtIndex(profile_index));
+}
 
-  size_t index = cache.GetIndexOfProfileWithPath(profile->GetPath());
-  cache.SetProfileSigninRequiredAtIndex(index, true);
-  chrome::ShowUserManager(profile->GetPath());
-  BrowserList::CloseAllBrowsersWithProfile(profile);
+void LockProfile(Profile* profile) {
+  DCHECK(profile);
+  if (profile) {
+    BrowserList::CloseAllBrowsersWithProfile(profile,
+        base::Bind(&LockBrowserCloseSuccess),
+        base::Bind(&BrowserList::DoNothing));
+  }
 }
 
 void CreateGuestProfileForUserManager(