Extract duplicated code in browser_tests for closing a browser.

chrome/browser/content_settings/content_settings_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 "base/command_line.h"
 #include "base/path_service.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/cookie_settings_factory.h"
@@ skipping 56 matching lines @@
     Browser* incognito = CreateIncognitoBrowser();
     ASSERT_TRUE(content::GetCookies(incognito->profile(), url).empty());
     ui_test_utils::NavigateToURL(incognito, url);
     ASSERT_EQ(cookies_enabled,
               !content::GetCookies(incognito->profile(), url).empty());
 
     // Ensure incognito cookies don't leak to regular profile.
     ASSERT_TRUE(content::GetCookies(browser()->profile(), url).empty());
 
     // Ensure cookies get wiped after last incognito window closes.
-    content::WindowedNotificationObserver signal(
-        chrome::NOTIFICATION_BROWSER_CLOSED,
-        content::Source<Browser>(incognito));
-
-    chrome::CloseWindow(incognito);
-
-#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
-
-    signal.Wait();
+    CloseBrowserSynchronously(incognito);
 
     incognito = CreateIncognitoBrowser();
     ASSERT_TRUE(content::GetCookies(incognito->profile(), url).empty());
-    chrome::CloseWindow(incognito);
+    CloseBrowserSynchronously(incognito);
   }
 
   void PreBasic(const GURL& url) {
     ASSERT_TRUE(GetCookies(browser()->profile(), url).empty());
 
     CookieCheckIncognitoWindow(url, true);
 
     ui_test_utils::NavigateToURL(browser(), url);
     ASSERT_FALSE(GetCookies(browser()->profile(), url).empty());
   }
@@ skipping 454 matching lines @@
   // Disable this test in Metro+Ash for now (http://crbug.com/262796).
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kAshBrowserTests))
     return;
 #endif
   RunJavaScriptBlockedTest("load_nacl_no_js.html", true);
 }
 #endif  // !defined(DISABLE_NACL)
 
 #endif  // defined(ENABLE_PLUGINS)