Reland: AppControllerMac updates the window when a Profile is deleted.

chrome/browser/app_controller_mac.mm

 // 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.
 
 #import "chrome/browser/app_controller_mac.h"
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 875 matching lines @@
 }
 
 // Called from the AppControllerProfileObserver every time a profile is deleted.
 - (void)profileWasRemoved:(const base::FilePath&)profilePath {
   // If the lastProfile has been deleted, the profile manager has
   // already loaded a new one, so the pointer needs to be updated;
   // otherwise we will try to start up a browser window with a pointer
   // to the old profile.
   // In a browser test, the application is not brought to the front, so
   // |lastProfile_| might be null.
-  if (!lastProfile_ || profilePath == lastProfile_->GetPath())
-    lastProfile_ = g_browser_process->profile_manager()->GetLastUsedProfile();
+  if (!lastProfile_ || profilePath == lastProfile_->GetPath()) {
+    // Force windowChangedToProfile: to set the lastProfile_ and also update the
+    // relevant menuBridge objects.
+    lastProfile_ = nullptr;
+    [self windowChangedToProfile:g_browser_process->profile_manager()->
+        GetLastUsedProfile()];
+  }
 
   auto it = profileBookmarkMenuBridgeMap_.find(profilePath);
   if (it != profileBookmarkMenuBridgeMap_.end()) {
     delete it->second;
     profileBookmarkMenuBridgeMap_.erase(it);
   }
 }
 
 // Returns true if there is a modal window (either window- or application-
 // modal) blocking the active browser. Note that tab modal dialogs (HTTP auth
@@ skipping 634 matching lines @@
 }
 
 - (const std::vector<GURL>&)startupUrls {
   return startupUrls_;
 }
 
 - (BookmarkMenuBridge*)bookmarkMenuBridge {
   return bookmarkMenuBridge_;
 }
 
+- (HistoryMenuBridge*)historyMenuBridge {
+  return historyMenuBridge_.get();
+}
+
 - (void)addObserverForWorkAreaChange:(ui::WorkAreaWatcherObserver*)observer {
   workAreaChangeObservers_.AddObserver(observer);
 }
 
 - (void)removeObserverForWorkAreaChange:(ui::WorkAreaWatcherObserver*)observer {
   workAreaChangeObservers_.RemoveObserver(observer);
 }
 
 - (void)initAppShimMenuController {
   if (!appShimMenuController_)
@@ skipping 141 matching lines @@
 
 //---------------------------------------------------------------------------
 
 namespace app_controller_mac {
 
 bool IsOpeningNewWindow() {
   return g_is_opening_new_window;
 }
 
 }  // namespace app_controller_mac