Extract duplicated code in browser_tests for closing a browser.

chrome/browser/ui/settings_window_manager_browsertest.cc

 // Copyright 2014 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/ui/settings_window_manager.h"
 
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_iterator.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/settings_window_manager_observer.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
@@ skipping 66 matching lines @@
       test_profile_ = profile;
       closure.Run();
     }
   }
 
   void ShowSettingsForProfile(Profile* profile) {
     settings_manager_->ShowChromePageForProfile(
         profile, GURL(chrome::kChromeUISettingsURL));
   }
 
-  void CloseBrowserSynchronously(Browser* browser) {
-    content::WindowedNotificationObserver observer(
-        chrome::NOTIFICATION_BROWSER_CLOSED,
-        content::NotificationService::AllSources());
-    browser->window()->Close();
-    observer.Wait();
-  }
-
   void CloseNonDefaultBrowsers() {
     std::list<Browser*> browsers_to_close;
     for (chrome::BrowserIterator it; !it.done(); it.Next()) {
       if (*it != browser())
         browsers_to_close.push_back(*it);
     }
     for (std::list<Browser*>::iterator iter = browsers_to_close.begin();
          iter != browsers_to_close.end(); ++iter) {
       CloseBrowserSynchronously(*iter);
     }
@@ skipping 90 matching lines @@
   EXPECT_EQ(1u, chrome::GetTotalBrowserCount());
 
   // Downloads should open in an existing browser window.
   chrome::ShowDownloads(browser());
   EXPECT_EQ(1u, chrome::GetTotalBrowserCount());
 
   // About should open a new browser window.
   chrome::ShowAboutChrome(browser());
   EXPECT_EQ(2u, chrome::GetTotalBrowserCount());
 }