Extract duplicated code in browser_tests for closing a browser.

chrome/browser/sessions/session_restore_browsertest.cc

 // Copyright 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 <vector>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/memory/memory_pressure_listener.h"
 #include "base/process/launch.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sessions/session_restore.h"
 #include "chrome/browser/sessions/session_restore_test_helper.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/sessions/session_service_test_helper.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
@@ skipping 77 matching lines @@
     url2_ = ui_test_utils::GetTestUrl(
         base::FilePath().AppendASCII("session_history"),
         base::FilePath().AppendASCII("bot2.html"));
     url3_ = ui_test_utils::GetTestUrl(
         base::FilePath().AppendASCII("session_history"),
         base::FilePath().AppendASCII("bot3.html"));
 
     return InProcessBrowserTest::SetUpUserDataDirectory();
   }
 
-  void CloseBrowserSynchronously(Browser* browser) {
-    content::WindowedNotificationObserver observer(
-        chrome::NOTIFICATION_BROWSER_CLOSED,
-        content::NotificationService::AllSources());
-    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();
-  }
-
   Browser* QuitBrowserAndRestore(Browser* browser, int expected_tab_count) {
     return QuitBrowserAndRestoreWithURL(
         browser, expected_tab_count, GURL(), true);
   }
 
   Browser* QuitBrowserAndRestoreWithURL(Browser* browser,
                                         int expected_tab_count,
                                         const GURL& url,
                                         bool no_memory_pressure) {
     Profile* profile = browser->profile();
@@ skipping 1376 matching lines @@
   // correct order.
   for (size_t i = 0; i < web_contents().size(); i++) {
     GURL expected_url = urls[activation_order2[num_tabs - i - 1]];
     ASSERT_EQ(expected_url, web_contents()[i]->GetLastCommittedURL());
     if (i > 0) {
       ASSERT_GT(web_contents()[i - 1]->GetLastActiveTime(),
                 web_contents()[i]->GetLastActiveTime());
     }
   }
 }