diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-15 00:33:47 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-15 00:33:47 +0000 |
| commit | 00504b7b644483bec97d74422ab095ad24c286bb (patch) | |
| tree | f9f0e6ad871ea29d030af793da7999bfe54ea5bb /chrome_frame | |
| parent | 1f226797e6880b7885c8866a8d7309b1c3aa44fc (diff) | |
| download | chromium_src-00504b7b644483bec97d74422ab095ad24c286bb.zip chromium_src-00504b7b644483bec97d74422ab095ad24c286bb.tar.gz chromium_src-00504b7b644483bec97d74422ab095ad24c286bb.tar.bz2 | |
As a best effort terminate IE at the end of each chrome frame test run on an error.
Bug=47596
Review URL: http://codereview.chromium.org/3432005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59470 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/chrome_frame_test_utils.cc | 2 | ||||
| -rw-r--r-- | chrome_frame/test/ie_event_sink.cc | 4 |
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; |