Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4118)

Unified Diff: chrome_frame/test_utils.cc

Issue 9460019: Reduce flakiness in chrome_frame_tests.exe by having each run in a clean environment. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixed compile break Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome_frame/test/ui_test.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/test_utils.cc
diff --git a/chrome_frame/test_utils.cc b/chrome_frame/test_utils.cc
index 4aca8e7d2df82795bba15cf6cfd5507266199c22..8ea5f6ec713ad4dbcf3bc0f8dd36e58da4d445ff 100644
--- a/chrome_frame/test_utils.cc
+++ b/chrome_frame/test_utils.cc
@@ -247,7 +247,7 @@ ScopedChromeFrameRegistrar::~ScopedChromeFrameRegistrar() {
if (IsWindow(chrome_frame_helper_window)) {
PostMessage(chrome_frame_helper_window, WM_CLOSE, 0, 0);
} else {
- chrome_frame_test::KillProcesses(L"chrome_frame_helper.exe", 0, false);
+ base::KillProcesses(L"chrome_frame_helper.exe", 0, NULL);
}
}
}
@@ -410,16 +410,7 @@ class ArgumentFilter : public base::ProcessFilter {
bool KillAllNamedProcessesWithArgument(const std::wstring& process_name,
const std::wstring& argument) {
- bool result = true;
- ArgumentFilter filter(argument);
- base::NamedProcessIterator iter(process_name, &filter);
- while (const base::ProcessEntry* entry = iter.NextProcessEntry()) {
- if (!base::KillProcessById(entry->pid(), 0, true)) {
- result = false;
- }
- }
-
- return result;
+ return base::KillProcesses(process_name, 0, &ArgumentFilter(argument));
}
bool IsWorkstationLocked() {
« no previous file with comments | « chrome_frame/test/ui_test.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698