summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-04 22:21:24 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-04 22:21:24 +0000
commitb8e6420cd4d878a51bd06db2df5ca6e7c8852444 (patch)
tree3b17675358dc92f446769cba1b2a9145e874bae0 /chrome_frame
parent171f683f8e4ba55dbf5e85f3c2c039a10fb65260 (diff)
downloadchromium_src-b8e6420cd4d878a51bd06db2df5ca6e7c8852444.zip
chromium_src-b8e6420cd4d878a51bd06db2df5ca6e7c8852444.tar.gz
chromium_src-b8e6420cd4d878a51bd06db2df5ca6e7c8852444.tar.bz2
Post a delayed QuitTask to the chrome frame net tests message loop to prevent it from waiting indefinitely
if the host browser(IE) dies abnormally. BUG=none TEST=ChromeFrame net tests should continue to run as before. Review URL: http://codereview.chromium.org/6930021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84139 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/test/net/fake_external_tab.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc
index d77bfd0..08127b9 100644
--- a/chrome_frame/test/net/fake_external_tab.cc
+++ b/chrome_frame/test/net/fake_external_tab.cc
@@ -19,6 +19,7 @@
#include "base/path_service.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
+#include "base/test/test_timeouts.h"
#include "base/threading/platform_thread.h"
#include "base/win/scoped_comptr.h"
#include "base/win/scoped_handle.h"
@@ -386,6 +387,9 @@ void CFUrlRequestUnittestRunner::TakeDownBrowser(
MessageBoxA(NULL, "click ok to exit", "", MB_OK);
me->ShutDownHostBrowser();
+ me->fake_chrome_.ui_loop()->PostDelayedTask(FROM_HERE,
+ new MessageLoop::QuitTask,
+ TestTimeouts::tiny_timeout_ms());
}
void CFUrlRequestUnittestRunner::InitializeLogging() {