Only do aggressive metro viewer termination in tests

win8/viewer/metro_viewer_process_host.cc

 // Copyright (c) 2013 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 "win8/viewer/metro_viewer_process_host.h"
 
 #include <shlobj.h>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 49 matching lines @@
 MetroViewerProcessHost::~MetroViewerProcessHost() {
   if (!channel_) {
     instance_ = NULL;
     return;
   }
 
   base::ProcessId viewer_process_id = GetViewerProcessId();
   channel_->Close();
   if (message_filter_) {
     // Wait for the viewer process to go away.
-    if (viewer_process_id != base::kNullProcessId) {
-      base::ProcessHandle viewer_process = NULL;
-      base::OpenProcessHandleWithAccess(
-          viewer_process_id,
-          PROCESS_QUERY_INFORMATION | SYNCHRONIZE,
-          &viewer_process);
-      if (viewer_process) {
-        ::WaitForSingleObject(viewer_process, INFINITE);
-        ::CloseHandle(viewer_process);
-      }
-    }
+    DisposeViewer(viewer_process_id, false);
     channel_->RemoveFilter(message_filter_);
   }
   instance_ = NULL;
 }
 
+void MetroViewerProcessHost::DisposeViewer(base::ProcessId viewer_process_id,
+                                           bool force_immediately) {
+  if (viewer_process_id != base::kNullProcessId) {
+    base::ProcessHandle viewer_process = NULL;
+    base::OpenProcessHandleWithAccess(viewer_process_id,
+                                      PROCESS_QUERY_INFORMATION | SYNCHRONIZE,
+                                      &viewer_process);

[ananta, 2014/09/20 00:32:54]

You need to add PROCESS_TERMINATE  to this mask

+    if (viewer_process) {
+      if (force_immediately) {
+        // In tests, we don't want to wait around for the viewer to
+        // terminate, so kill it immediately. See http://crbug.com/411147
+        // for more details.
+        ::TerminateProcess(viewer_process, 0);
+      } else {
+        ::WaitForSingleObject(viewer_process, INFINITE);
+      }
+      ::CloseHandle(viewer_process);
+    }
+  }
+}
+
 base::ProcessId MetroViewerProcessHost::GetViewerProcessId() {
   if (channel_)
     return channel_->GetPeerPID();
   return base::kNullProcessId;
 }
 
 bool MetroViewerProcessHost::LaunchViewerAndWaitForConnection(
     const base::string16& app_user_model_id) {
   DCHECK_EQ(base::kNullProcessId, channel_->GetPeerPID());
 
@@ skipping 239 matching lines @@
     const base::FilePath& folder) {
   if (success)
     select_folder_completion_callback_.Run(base::FilePath(folder), 0, NULL);
   else
     failure_callback_.Run(NULL);
   select_folder_completion_callback_.Reset();
   failure_callback_.Reset();
 }
 
 }  // namespace win8