diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-12 15:58:52 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-12 15:58:52 +0000 |
| commit | 128f9d98116b8b661aec44b5da4ef1232f3b32fd (patch) | |
| tree | 0f26cf74cb37f53aa5e4368a31553f139bf9a706 /chrome_frame | |
| parent | 4491a7825cc754614cf849def41be8c83a082a0e (diff) | |
| download | chromium_src-128f9d98116b8b661aec44b5da4ef1232f3b32fd.zip chromium_src-128f9d98116b8b661aec44b5da4ef1232f3b32fd.tar.gz chromium_src-128f9d98116b8b661aec44b5da4ef1232f3b32fd.tar.bz2 | |
Add chrome_launcher to the list of processes terminated at the beginning and end of chrome frame test runs. This is to get around
extract build failures on the IE6 builder as chrome launcher does not shutdown at times.
TBR=amit
Review URL: http://codereview.chromium.org/1646001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44248 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/chrome_frame_test_utils.cc | 1 | ||||
| -rw-r--r-- | chrome_frame/test/chrome_frame_test_utils.h | 1 | ||||
| -rw-r--r-- | chrome_frame/test/test_with_web_server.cc | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/chrome_frame/test/chrome_frame_test_utils.cc b/chrome_frame/test/chrome_frame_test_utils.cc index aeedeee..3aa7612 100644 --- a/chrome_frame/test/chrome_frame_test_utils.cc +++ b/chrome_frame/test/chrome_frame_test_utils.cc @@ -36,6 +36,7 @@ const wchar_t kOperaImageName[] = L"opera.exe"; const wchar_t kSafariImageName[] = L"safari.exe"; const wchar_t kChromeImageName[] = L"chrome.exe"; const wchar_t kIEProfileName[] = L"iexplore"; +const wchar_t kChromeLauncher[] = L"chrome_launcher.exe"; // Callback function for EnumThreadWindows. BOOL CALLBACK CloseWindowsThreadCallback(HWND hwnd, LPARAM param) { diff --git a/chrome_frame/test/chrome_frame_test_utils.h b/chrome_frame/test/chrome_frame_test_utils.h index ebb3ff7..a3d032c 100644 --- a/chrome_frame/test/chrome_frame_test_utils.h +++ b/chrome_frame/test/chrome_frame_test_utils.h @@ -51,6 +51,7 @@ extern const wchar_t kFirefoxImageName[]; extern const wchar_t kOperaImageName[]; extern const wchar_t kSafariImageName[]; extern const wchar_t kChromeImageName[]; +extern const wchar_t kChromeLauncher[]; // Temporarily impersonate the current thread to low integrity for the lifetime // of the object. Destructor will automatically revert integrity level. diff --git a/chrome_frame/test/test_with_web_server.cc b/chrome_frame/test/test_with_web_server.cc index 637f37d..991efdae 100644 --- a/chrome_frame/test/test_with_web_server.cc +++ b/chrome_frame/test/test_with_web_server.cc @@ -49,6 +49,7 @@ void ChromeFrameTestWithWebServer::CloseAllBrowsers() { // Endeavour to only kill off Chrome Frame derived Chrome processes. KillAllNamedProcessesWithArgument(chrome_frame_test::kChromeImageName, UTF8ToWide(switches::kChromeFrame)); + base::KillProcesses(chrome_frame_test::kChromeLauncher, 0, NULL); } void ChromeFrameTestWithWebServer::SetUp() { |