Only do aggressive metro viewer termination in tests

ash/test/ash_test_base.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/test/ash_test_base.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/ash_switches.h"
@@ skipping 21 matching lines @@
 #include "ui/gfx/point.h"
 #include "ui/gfx/screen.h"
 #include "ui/wm/core/coordinate_conversion.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/system/chromeos/tray_display.h"
 #endif
 
 #if defined(OS_WIN)
 #include "ash/test/test_metro_viewer_process_host.h"
-#include "base/test/test_process_killer_win.h"
 #include "base/win/metro.h"
 #include "base/win/windows_version.h"
 #include "ui/aura/remote_window_tree_host_win.h"
 #include "ui/aura/window_tree_host_win.h"
 #include "ui/platform_window/win/win_window.h"
 #include "win8/test/test_registrar_constants.h"
 #endif
 
 #if defined(USE_X11)
 #include "ui/gfx/x/x11_connection.h"
@@ skipping 116 matching lines @@
           ash::switches::kForceAshToDesktop)) {
     // Check that our viewer connection is still established.
     CHECK(!metro_viewer_host_->closed_unexpectedly());
   }
 #endif
 
   ash_test_helper_->TearDown();
 #if defined(OS_WIN)
   ui::test::SetUsePopupAsRootWindowForTest(false);
   // Kill the viewer process if we spun one up.
-  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);
+  if (metro_viewer_host_) {
+    metro_viewer_host_->TerminateViewer();
+    metro_viewer_host_.reset();
+  }
 #endif
 
   event_generator_.reset();
   // Some tests set an internal display id,
   // reset it here, so other tests will continue in a clean environment.
   gfx::Display::SetInternalDisplayId(gfx::Display::kInvalidDisplayID);
 }
 
 ui::test::EventGenerator& AshTestBase::GetEventGenerator() {
   if (!event_generator_) {
@@ skipping 138 matching lines @@
 
 void AshTestBase::UnblockUserSession() {
   Shell::GetInstance()->session_state_delegate()->UnlockScreen();
   SetSessionStarted(true);
   SetUserAddingScreenRunning(false);
 }
 
 
 }  // namespace test
 }  // namespace ash