summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authormpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-27 19:18:41 +0000
committermpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-27 19:18:41 +0000
commitcc661e5f76c24a8640dbe818a1091e0fe60e1529 (patch)
tree09a8c5c6c76a4c5c990eb1a3fe862373d9536ebe /chrome/test
parent1a16364587d4fe3592b78d04ac13b5abfbd6360e (diff)
downloadchromium_src-cc661e5f76c24a8640dbe818a1091e0fe60e1529.zip
chromium_src-cc661e5f76c24a8640dbe818a1091e0fe60e1529.tar.gz
chromium_src-cc661e5f76c24a8640dbe818a1091e0fe60e1529.tar.bz2
Fix port disconnect so that it's refcounted. This fixes a bug where a channel
would close if any one listener on the channel called "disconnect()". BUG=16644 TEST=no Review URL: http://codereview.chromium.org/155476 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21678 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/in_process_browser_test.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/test/in_process_browser_test.cc b/chrome/test/in_process_browser_test.cc
index 36deb0b..36f2977 100644
--- a/chrome/test/in_process_browser_test.cc
+++ b/chrome/test/in_process_browser_test.cc
@@ -235,14 +235,15 @@ void InProcessBrowserTest::RunTestOnMainThreadLoop() {
RunTestOnMainThread();
CleanUpOnMainThread();
+ // Close all browser windows. This might not happen immediately, since some
+ // may need to wait for beforeunload and unload handlers to fire in a tab.
+ // When all windows are closed, the last window will call Quit().
BrowserList::const_iterator browser = BrowserList::begin();
for (; browser != BrowserList::end(); ++browser)
- (*browser)->CloseAllTabs();
+ (*browser)->CloseWindow();
// Stop the HTTP server.
http_server_ = NULL;
-
- MessageLoopForUI::current()->Quit();
}
void InProcessBrowserTest::ConfigureHostResolverProc(