Extract duplicated code in browser_tests for closing a browser.

chrome/browser/sessions/better_session_restore_browsertest.cc

 // 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.
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/background/background_mode_manager.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/cookie_settings_factory.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_impl.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sessions/session_restore_test_helper.h"
 #include "chrome/browser/sessions/session_service_factory.h"
@@ skipping 276 matching lines @@
     EXPECT_EQ(text_present,
               post_interceptor_->DidLastUploadContain("posted-text"));
     EXPECT_EQ(text_present,
               post_interceptor_->DidLastUploadContain("text-entered"));
     EXPECT_EQ(password_present,
               post_interceptor_->DidLastUploadContain("posted-password"));
     EXPECT_EQ(password_present,
               post_interceptor_->DidLastUploadContain("password-entered"));
   }
 
-  void CloseBrowserSynchronously(Browser* browser, bool close_all_windows) {
-    content::WindowedNotificationObserver observer(
-        chrome::NOTIFICATION_BROWSER_CLOSED,
-        content::NotificationService::AllSources());
-    if (close_all_windows)
-      chrome::CloseAllBrowsers();
-    else
-      browser->window()->Close();
-#if defined(OS_MACOSX)
-    // BrowserWindowController depends on the auto release pool being recycled
-    // in the message loop to delete itself, which frees the Browser object
-    // which fires this event.
-    AutoreleasePool()->Recycle();
-#endif
-    observer.Wait();
-  }
-
   virtual Browser* QuitBrowserAndRestore(Browser* browser,
                                          bool close_all_windows) {
     Profile* profile = browser->profile();
 
     // Close the browser.
     chrome::IncrementKeepAliveCount();
-    CloseBrowserSynchronously(browser, close_all_windows);
+    if (close_all_windows)
+      CloseAllBrowsers();
+    else
+      CloseBrowserSynchronously(browser);
 
     SessionServiceTestHelper helper;
     helper.SetService(
         SessionServiceFactory::GetForProfileForSessionRestore(profile));
     helper.SetForceBrowserNotAliveWithNoWindows(true);
     helper.ReleaseService();
 
     // Create a new window, which should trigger session restore.
     ui_test_utils::BrowserAddedObserver window_observer;
     chrome::NewEmptyWindow(profile, chrome::HOST_DESKTOP_TYPE_NATIVE);
@@ skipping 447 matching lines @@
 // Tests that session cookies are cleared if the last window to close is a
 // popup.
 IN_PROC_BROWSER_TEST_F(NoSessionRestoreTest,
                        SessionCookiesBrowserClosePopupLast) {
   StoreDataWithPage("session_cookies.html");
   Browser* popup = new Browser(Browser::CreateParams(
       Browser::TYPE_POPUP,
       browser()->profile(),
       chrome::HOST_DESKTOP_TYPE_NATIVE));
   popup->window()->Show();
-  CloseBrowserSynchronously(browser(), false);
+  CloseBrowserSynchronously(browser());
   Browser* new_browser = QuitBrowserAndRestore(popup, false);
   if (browser_defaults::kBrowserAliveWithNoWindows)
     NavigateAndCheckStoredData(new_browser, "session_cookies.html");
   else
     StoreDataWithPage(new_browser, "session_cookies.html");
 }
 
 IN_PROC_BROWSER_TEST_F(NoSessionRestoreTest, CookiesClearedOnBrowserClose) {
   StoreDataWithPage("cookies.html");
 
@@ skipping 40 matching lines @@
   CookieSettingsFactory::GetForProfile(new_browser->profile())
       ->SetDefaultCookieSetting(CONTENT_SETTING_SESSION_ONLY);
   // ... even if background mode is active.
   EnableBackgroundMode();
   new_browser = QuitBrowserAndRestore(new_browser, true);
   StoreDataWithPage(new_browser, "cookies.html");
   DisableBackgroundMode();
   new_browser = QuitBrowserAndRestore(new_browser, true);
   StoreDataWithPage(new_browser, "cookies.html");
 }