summaryrefslogtreecommitdiffstats
path: root/chrome_frame/test/chrome_frame_automation_mock.h
diff options
context:
space:
mode:
Diffstat (limited to 'chrome_frame/test/chrome_frame_automation_mock.h')
-rw-r--r--chrome_frame/test/chrome_frame_automation_mock.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome_frame/test/chrome_frame_automation_mock.h b/chrome_frame/test/chrome_frame_automation_mock.h
index 6c05a5f..739f904 100644
--- a/chrome_frame/test/chrome_frame_automation_mock.h
+++ b/chrome_frame/test/chrome_frame_automation_mock.h
@@ -10,6 +10,7 @@
#include "base/file_path.h"
#include "base/path_service.h"
#include "base/utf_string_conversions.h"
+#include "chrome/common/chrome_switches.h"
#include "chrome_frame/chrome_frame_automation.h"
#include "chrome_frame/chrome_frame_plugin.h"
#include "chrome_frame/navigation_constraints.h"
@@ -33,6 +34,11 @@ class AutomationMockDelegate
mock_server_(1337, L"127.0.0.1",
chrome_frame_test::GetTestDataFolder()) {
+ // Endeavour to only kill off Chrome Frame derived Chrome processes.
+ KillAllNamedProcessesWithArgument(
+ UTF8ToWide(chrome_frame_test::kChromeImageName),
+ UTF8ToWide(switches::kChromeFrame));
+
mock_server_.ExpectAndServeAnyRequests(CFInvocation(CFInvocation::NONE));
FilePath profile_path(