summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome_frame/test/chrome_frame_test_utils.cc2
-rw-r--r--chrome_frame/test/ie_event_sink.cc4
2 files changed, 4 insertions, 2 deletions
diff --git a/chrome_frame/test/chrome_frame_test_utils.cc b/chrome_frame/test/chrome_frame_test_utils.cc
index 3a11937..f4bc556 100644
--- a/chrome_frame/test/chrome_frame_test_utils.cc
+++ b/chrome_frame/test/chrome_frame_test_utils.cc
@@ -27,8 +27,6 @@
namespace chrome_frame_test {
-const int kDefaultWaitForIEToTerminateMs = 10 * 1000;
-
const wchar_t kIEImageName[] = L"iexplore.exe";
const wchar_t kIEBrokerImageName[] = L"ieuser.exe";
const wchar_t kFirefoxImageName[] = L"firefox.exe";
diff --git a/chrome_frame/test/ie_event_sink.cc b/chrome_frame/test/ie_event_sink.cc
index 0e5ddcb..65e0a41 100644
--- a/chrome_frame/test/ie_event_sink.cc
+++ b/chrome_frame/test/ie_event_sink.cc
@@ -164,6 +164,10 @@ void IEEventSink::Uninitialize() {
} else {
DCHECK(wait == WAIT_TIMEOUT);
DLOG(ERROR) << "Wait for IE timed out";
+ if (!TerminateProcess(process, 0)) {
+ DLOG(ERROR) << "Failed to terminate IE. Error:"
+ << ::GetLastError();
+ }
break;
}
base::TimeDelta elapsed = base::Time::Now() - start;