diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-04 23:07:51 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-04 23:07:51 +0000 |
| commit | b9273eeff17d338254de7450c5b3288080941c11 (patch) | |
| tree | e9a1ec17d1516c6d44a13ed11ac5dc10b36662ef /chrome_frame/test | |
| parent | 8ea2a8155f7fe2bdd4d6611264bce1b764adae5a (diff) | |
| download | chromium_src-b9273eeff17d338254de7450c5b3288080941c11.zip chromium_src-b9273eeff17d338254de7450c5b3288080941c11.tar.gz chromium_src-b9273eeff17d338254de7450c5b3288080941c11.tar.bz2 | |
Terminate any zombie ChromeFrame processes before running the ChromeFrame AutomationProxyMock test. This is
an attempt to fix the flaky ChromeFrame.RequestStart and ChromeFrame.Launch tests
BUG=none
TEST=The ChromeFrame.RequestStart and ChromeFrame.Launch tests should hopefully be more reliable.
Review URL: http://codereview.chromium.org/6927031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84149 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test')
| -rw-r--r-- | chrome_frame/test/chrome_frame_automation_mock.h | 6 |
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( |