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

Unified Diff: chrome_frame/test/chrome_frame_automation_mock.h

Issue 12314043: Make Ash unittests clean up zombie viewer processes between test runs. These zombie viewer proce… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: "Add missing test_scrubber.cc change." Created 7 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
Index: chrome_frame/test/chrome_frame_automation_mock.h
diff --git a/chrome_frame/test/chrome_frame_automation_mock.h b/chrome_frame/test/chrome_frame_automation_mock.h
index 8399d5357faa2bbfdc3ddcad12368365656647a8..10cd320984f760e8e9778cfff576426a1d711ce2 100644
--- a/chrome_frame/test/chrome_frame_automation_mock.h
+++ b/chrome_frame/test/chrome_frame_automation_mock.h
@@ -9,12 +9,12 @@
#include "base/file_path.h"
#include "base/path_service.h"
+#include "base/test/test_process_killer_win.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"
-#include "chrome_frame/test/chrome_frame_test_utils.h"
#include "chrome_frame/test/test_scrubber.h"
#include "chrome_frame/test/test_with_web_server.h"
#include "chrome_frame/utils.h"
@@ -35,7 +35,7 @@ class AutomationMockDelegate
chrome_frame_test::GetTestDataFolder()) {
// Endeavour to only kill off Chrome Frame derived Chrome processes.
- KillAllNamedProcessesWithArgument(
+ base::KillAllNamedProcessesWithArgument(
UTF8ToWide(chrome_frame_test::kChromeImageName),
UTF8ToWide(switches::kChromeFrame));

Powered by Google App Engine
This is Rietveld 408576698