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

Unified Diff: ash/test/ash_test_base.cc

Issue 584213002: Only do aggressive metro viewer termination in tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: simplify Created 6 years, 3 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 | « no previous file | ash/test/test_metro_viewer_process_host.h » ('j') | base/test/test_process_killer_win.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/ash_test_base.cc
diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc
index 166e2b7d007df4a1aebf69a5e40342c9c753bfae..912c1e676ccadea7efa877f27ecb2567b83dae5a 100644
--- a/ash/test/ash_test_base.cc
+++ b/ash/test/ash_test_base.cc
@@ -176,15 +176,8 @@ void AshTestBase::TearDown() {
#if defined(OS_WIN)
ui::test::SetUsePopupAsRootWindowForTest(false);
// Kill the viewer process if we spun one up.
+ metro_viewer_host_->TerminateViewer();
metro_viewer_host_.reset();
-
- // Clean up any dangling viewer processes as the metro APIs sometimes leave
- // zombies behind. A default browser process in metro will have the
- // following command line arg so use that to avoid killing all processes named
- // win8::test::kDefaultTestExePath.
- const wchar_t kViewerProcessArgument[] = L"DefaultBrowserServer";
- base::KillAllNamedProcessesWithArgument(win8::test::kDefaultTestExePath,
- kViewerProcessArgument);
#endif
event_generator_.reset();
« no previous file with comments | « no previous file | ash/test/test_metro_viewer_process_host.h » ('j') | base/test/test_process_killer_win.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698