summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/test/chrome_frame_test_utils.cc1
-rw-r--r--chrome_frame/test/chrome_frame_test_utils.h1
-rw-r--r--chrome_frame/test/test_with_web_server.cc1
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() {