summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorhuanr@chromium.org <huanr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-09 04:07:55 +0000
committerhuanr@chromium.org <huanr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-09 04:07:55 +0000
commit65a8a612270f60c09d92c9e02b51b05330c9f3d0 (patch)
tree5d2e206c32adff6d8ee944a5fdcc3f73c476bbc4 /chrome
parentb76a0b09a2a375cecd4c0647738f9aaff21dab06 (diff)
downloadchromium_src-65a8a612270f60c09d92c9e02b51b05330c9f3d0.zip
chromium_src-65a8a612270f60c09d92c9e02b51b05330c9f3d0.tar.gz
chromium_src-65a8a612270f60c09d92c9e02b51b05330c9f3d0.tar.bz2
Revert r15693. The crash spike still exists.
Review URL: http://codereview.chromium.org/113181 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15713 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/test/ui/ui_test.cc24
-rw-r--r--chrome/test/ui/ui_test.h8
2 files changed, 6 insertions, 26 deletions
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index 4a594c1..62ba163 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -407,12 +407,9 @@ void UITest::QuitBrowser() {
for (BrowserVector::iterator iter = browsers.begin();
iter != browsers.end(); ++iter) {
- bool application_closed = false;
- CloseBrowserWithTimeout(*iter, &application_closed,
- action_timeout_ms(), NULL);
+ // Use ApplyAccelerator since it doesn't wait
+ (*iter)->ApplyAccelerator(IDC_CLOSE_WINDOW);
delete (*iter);
- if (application_closed)
- break;
}
// Now, drop the automation IPC channel so that the automation provider in
@@ -740,31 +737,22 @@ void UITest::CloseBrowserAsync(BrowserProxy* browser) const {
bool UITest::CloseBrowser(BrowserProxy* browser,
bool* application_closed) const {
- return CloseBrowserWithTimeout(browser, application_closed,
- base::kNoTimeout, NULL);
-}
-
-bool UITest::CloseBrowserWithTimeout(BrowserProxy* browser,
- bool* application_closed,
- int timeout_ms,
- bool* is_timeout) const {
DCHECK(application_closed);
if (!browser->is_valid() || !browser->handle())
return false;
bool result = true;
- bool succeeded = server_->SendWithTimeout(
- new AutomationMsg_CloseBrowser(
- 0, browser->handle(), &result, application_closed),
- timeout_ms, is_timeout);
+ bool succeeded = server_->Send(new AutomationMsg_CloseBrowser(
+ 0, browser->handle(), &result, application_closed));
if (!succeeded)
return false;
if (*application_closed) {
// Let's wait until the process dies (if it is not gone already).
- result = base::WaitForSingleProcess(process_, timeout_ms);
+ bool success = base::WaitForSingleProcess(process_, base::kNoTimeout);
+ DCHECK(success);
}
return result;
diff --git a/chrome/test/ui/ui_test.h b/chrome/test/ui/ui_test.h
index 1196760..543f1fd 100644
--- a/chrome/test/ui/ui_test.h
+++ b/chrome/test/ui/ui_test.h
@@ -201,14 +201,6 @@ class UITest : public testing::Test {
// after the browser process has terminated.
bool CloseBrowser(BrowserProxy* browser, bool* application_closed) const;
- // Closes the specified browser. Returns true if the browser was closed.
- // If this was the last browser window, |application_closed| is set to true
- // and the function returns after the browser process has terminated.
- // This call blocks on closing until specified timeout_ms is reached. If
- // timed out, it returns false with is_timeout set to true.
- bool CloseBrowserWithTimeout(BrowserProxy* browser, bool* application_closed,
- int timeout_ms, bool* is_timeout) const;
-
// Prints numerical information to stdout in a controlled format, for
// post-processing. |measurement| is a description of the quantity being
// measured, e.g. "vm_peak"; |modifier| is provided as a convenience and