Make Ash unittests clean up zombie viewer processes between test runs. These zombie viewer proce…

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 14 matching lines @@
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/base/ime/text_input_test_support.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 
 #if defined(OS_WIN)
 #include "ash/test/test_metro_viewer_process_host.h"
+#include "base/test/test_process_util_win.h"
 #include "base/win/windows_version.h"
 #include "ui/aura/remote_root_window_host_win.h"
 #include "ui/aura/root_window_host_win.h"
 #include "win8/test/test_registrar_constants.h"
 #endif
 
 namespace ash {
 namespace test {
 namespace {
 
@@ skipping 79 matching lines @@
   if (base::win::GetVersion() >= base::win::VERSION_WIN8) {
     // Check that our viewer connection is still established.
     ASSERT_FALSE(metro_viewer_host_->closed_unexpectedly());
   }
 #endif
 
   // Tear down the shell.
   Shell::DeleteInstance();
   aura::Env::DeleteInstance();
   ui::TextInputTestSupport::Shutdown();
+
 #if defined(OS_WIN)
   aura::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";
+  KillAllNamedProcessesWithArgument(win8::test::kDefaultTestExePath,
+                                    kViewerProcessArgument);
 #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);
 }
 
 aura::test::EventGenerator& AshTestBase::GetEventGenerator() {
   if (!event_generator_.get()) {
     event_generator_.reset(
         new aura::test::EventGenerator(new AshEventGeneratorDelegate()));
@@ skipping 99 matching lines @@
 void AshTestBase::SetUserLoggedIn(bool user_logged_in) {
   test_shell_delegate_->SetUserLoggedIn(user_logged_in);
 }
 
 void AshTestBase::SetCanLockScreen(bool can_lock_screen) {
   test_shell_delegate_->SetCanLockScreen(can_lock_screen);
 }
 
 }  // namespace test
 }  // namespace ash