Fix sketchy User Manager code :(

chrome/browser/profiles/profile_window.cc

 // Copyright 2013 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_window.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/user_metrics.h"
 
 #if !defined(OS_IOS)
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_list_observer.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/startup/startup_browser_creator.h"
 #endif  // !defined (OS_IOS)
 
 using base::UserMetricsAction;
 using content::BrowserThread;
 
 namespace {
 
 // Handles running a callback when a new Browser has been completely created.

[Alexei Svitkine (slow), 2014/02/07 15:44:43]

Expand comment to say "a new Browser for the given profile".

[noms (inactive), 2014/02/07 16:30:58]

Done.

-class BrowserAddedObserver : public chrome::BrowserListObserver {
+class BrowserAddedForProfileObserver : public chrome::BrowserListObserver {
  public:
-  explicit BrowserAddedObserver(
-      profiles::ProfileSwitchingDoneCallback callback) : callback_(callback) {
+  BrowserAddedForProfileObserver(
+      Profile* profile, profiles::ProfileSwitchingDoneCallback callback)

[Alexei Svitkine (slow), 2014/02/07 15:44:43]

1 param per line

[noms (inactive), 2014/02/07 16:30:58]

Done.

+      : profile_(profile),
+        callback_(callback) {
+    DCHECK(!callback_.is_null());
     BrowserList::AddObserver(this);
   }
-  virtual ~BrowserAddedObserver() {
-    BrowserList::RemoveObserver(this);
+  virtual ~BrowserAddedForProfileObserver() {
   }
 
  private:
   // Overridden from BrowserListObserver:
   virtual void OnBrowserAdded(Browser* browser) OVERRIDE {
-    DCHECK(!callback_.is_null());
-    callback_.Run();
+    if (browser->profile() == profile_) {
+      BrowserList::RemoveObserver(this);
+      callback_.Run();
+      base::MessageLoop::current()->DeleteSoon(FROM_HERE, this);
+    }
   }
 
+  // Profile for which the browser should be opened.
+  Profile* profile_;
   profiles::ProfileSwitchingDoneCallback callback_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserAddedObserver);
 };
 
 void OpenBrowserWindowForProfile(
     profiles::ProfileSwitchingDoneCallback callback,
     bool always_create,
     bool is_new_profile,
     chrome::HostDesktopType desktop_type,
@@ skipping 28 matching lines @@
     Browser* browser = chrome::FindTabbedBrowser(profile, false, desktop_type);
     if (browser) {
       browser->window()->Activate();
       if (!callback.is_null())
         callback.Run();
       return;
     }
   }
 
   // If there is a callback, create an observer to make sure it is only
-  // run when the browser has been completely created.
-  scoped_ptr<BrowserAddedObserver> browser_added_observer;
+  // run when the browser has been completely created. This observer will
+  // delete itself once that happens. This should not leak, because we are
+  // passing |always_create| = true to FindOrCreateNewWindow below, which ends
+  // up calling LaunchBrowser and opens a new window. If for whatever reason
+  // that fails, either something has crashed, or the observer will be cleaned
+  // up when a different browser for this profile is opened.
   if (!callback.is_null())
-    browser_added_observer.reset(new BrowserAddedObserver(callback));
+    new BrowserAddedForProfileObserver(profile, callback);
 
   // We already dealt with the case when |always_create| was false and a browser
   // existed, which means that here a browser definitely needs to be created.
   // Passing true for |always_create| means we won't duplicate the code that
   // tries to find a browser.
   profiles::FindOrCreateNewWindowForProfile(
       profile,
       is_process_startup,
       is_first_run,
       desktop_type,
@@ skipping 95 matching lines @@
   ProfileInfoCache& cache =
       g_browser_process->profile_manager()->GetProfileInfoCache();
 
   size_t index = cache.GetIndexOfProfileWithPath(profile->GetPath());
   cache.SetProfileSigninRequiredAtIndex(index, true);
   chrome::ShowUserManager(profile->GetPath());
   BrowserList::CloseAllBrowsersWithProfile(profile);
 }
 
 }  // namespace profiles