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

chrome/browser/app_controller_mac_browsertest.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 <Carbon/Carbon.h>
 #import <Cocoa/Cocoa.h>
 #import <Foundation/Foundation.h>
 #import <Foundation/NSAppleEventDescriptor.h>
 #import <objc/message.h>
 #import <objc/runtime.h>
 
 #include "base/command_line.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/prefs/pref_service.h"
 #include "base/run_loop.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #import "chrome/browser/app_controller_mac.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h"
+#include "chrome/browser/ui/cocoa/history_menu_bridge.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/user_manager.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/bookmarks/test/bookmark_test_helpers.h"
@@ skipping 32 matching lines @@
   Method get_url =
       class_getInstanceMethod([controller class], @selector(getUrl:withReply:));
 
   ASSERT_TRUE(get_url);
 
   NSAppleEventDescriptor* shortcut_event = AppleEventToOpenUrl(url);
 
   method_invoke(controller, get_url, shortcut_event, NULL);
 }
 
+void RunClosureWhenProfileInitialized(const base::Closure& closure,
+                                      Profile* profile,
+                                      Profile::CreateStatus status) {
+  if (status == Profile::CREATE_STATUS_INITIALIZED)
+    closure.Run();
+}
+
 }  // namespace
 
 @interface TestOpenShortcutOnStartup : NSObject
 - (void)applicationWillFinishLaunching:(NSNotification*)notification;
 @end
 
 @implementation TestOpenShortcutOnStartup
 
 - (void)applicationWillFinishLaunching:(NSNotification*)notification {
   if (!g_open_shortcut_url.is_valid())
@@ skipping 328 matching lines @@
                 ->GetLastCommittedURL());
 }
 
 class AppControllerMainMenuBrowserTest : public InProcessBrowserTest {
  protected:
   AppControllerMainMenuBrowserTest() {
   }
 };
 
 IN_PROC_BROWSER_TEST_F(AppControllerMainMenuBrowserTest,
+    HistoryMenuResetAfterProfileDeletion) {
+  ProfileManager* profile_manager = g_browser_process->profile_manager();
+  AppController* ac = [NSApp delegate];
+
+  // Use the existing profile as profile 1.
+  Profile* profile1 = browser()->profile();
+
+  // Create profile 2.
+  base::FilePath profile2_path =
+      profile_manager->GenerateNextProfileDirectoryPath();
+  base::RunLoop run_loop;
+  profile_manager->CreateProfileAsync(
+      profile2_path,
+      base::Bind(&RunClosureWhenProfileInitialized,
+                 run_loop.QuitClosure()),
+                 base::string16(),
+                 base::string16(),
+                 std::string());
+  run_loop.Run();
+  Profile* profile2 = profile_manager->GetProfileByPath(profile2_path);
+  ASSERT_TRUE(profile2);
+
+  // Switch the controller to profile1.
+  [ac windowChangedToProfile:profile1];
+  base::RunLoop().RunUntilIdle();
+
+  // Verify the controller's History Menu corresponds to profile1.
+  EXPECT_TRUE([ac historyMenuBridge]->service());
+  EXPECT_EQ([ac historyMenuBridge]->service(),
+      HistoryServiceFactory::GetForProfile(profile1,
+                                           ServiceAccessType::EXPLICIT_ACCESS));
+
+  // Load profile2's History Service backend so it will be assigned to the
+  // HistoryMenuBridge when windowChangedToProfile is called, or else this test
+  // will fail flaky.
+  ui_test_utils::WaitForHistoryToLoad(
+      HistoryServiceFactory::GetForProfile(profile2,
+                                           ServiceAccessType::EXPLICIT_ACCESS));
+  // Switch the controller to profile2.
+  [ac windowChangedToProfile:profile2];
+  base::RunLoop().RunUntilIdle();
+
+  // Verify the controller's History Menu has changed.
+  EXPECT_TRUE([ac historyMenuBridge]->service());
+  EXPECT_EQ([ac historyMenuBridge]->service(),
+      HistoryServiceFactory::GetForProfile(profile2,
+                                           ServiceAccessType::EXPLICIT_ACCESS));
+  EXPECT_NE(
+      HistoryServiceFactory::GetForProfile(profile1,
+                                           ServiceAccessType::EXPLICIT_ACCESS),
+      HistoryServiceFactory::GetForProfile(profile2,
+                                           ServiceAccessType::EXPLICIT_ACCESS));
+
+  // Delete profile2.
+  profile_manager->ScheduleProfileForDeletion(
+      profile2->GetPath(), ProfileManager::CreateCallback());
+  base::RunLoop().RunUntilIdle();
+
+  // Verify the controller's history is back to profile1.
+  EXPECT_EQ([ac historyMenuBridge]->service(),
+      HistoryServiceFactory::GetForProfile(profile1,
+                                           ServiceAccessType::EXPLICIT_ACCESS));
+}
+
+IN_PROC_BROWSER_TEST_F(AppControllerMainMenuBrowserTest,
     BookmarksMenuIsRestoredAfterProfileSwitch) {
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   base::scoped_nsobject<AppController> ac([[AppController alloc] init]);
   [ac awakeFromNib];
 
   // Constants for bookmarks that we will create later.
   const base::string16 title1(base::ASCIIToUTF16("Dinosaur Comics"));
   const GURL url1("http://qwantz.com//");
 
   const base::string16 title2(base::ASCIIToUTF16("XKCD"));
@@ skipping 175 matching lines @@
   ui_test_utils::NavigateToURL(browser3, test_url1);
   EXPECT_EQ(g_handoff_url, GURL());
 
   // Activate the original browser window.
   Browser* browser1 = active_browser_list->get(0);
   browser1->window()->Show();
   EXPECT_EQ(g_handoff_url, test_url2);
 }
 
 }  // namespace