Only do aggressive metro viewer termination in tests

win8/viewer/metro_viewer_process_host.h

Index: win8/viewer/metro_viewer_process_host.h
diff --git a/win8/viewer/metro_viewer_process_host.h b/win8/viewer/metro_viewer_process_host.h
index 19e9627deac9e610f052468b69531f1045631445..333e3329a511015a1dd7c31e33eb58c9696dacc4 100644
--- a/win8/viewer/metro_viewer_process_host.h
+++ b/win8/viewer/metro_viewer_process_host.h
@@ -70,6 +70,11 @@ class METRO_VIEWER_EXPORT MetroViewerProcessHost : public IPC::Listener,
   bool LaunchViewerAndWaitForConnection(
       const base::string16& app_user_model_id);
 
+  // Same as above, except flags that we're launching for running tests. This
+  // causes more aggressive termination when shutting down the viewer.
+  bool LaunchViewerAndWaitForConnectionForTests(
+      const base::string16& app_user_model_id);
+
   // Handles the activate desktop command for Metro Chrome Ash. The |ash_exit|
   // parameter indicates whether the Ash process would be shutdown after
   // activating the desktop.
@@ -208,6 +213,11 @@ class METRO_VIEWER_EXPORT MetroViewerProcessHost : public IPC::Listener,
   SelectFolderCompletion select_folder_completion_callback_;
   FileSelectionCanceled failure_callback_;
 
+  // Whether LaunchViewerAndWaitForConnection was for test binaries. In tests,
+  // we are more aggressive in terminating the viewer so that it can
+  // immediately be relaunched for the next test.
+  bool launched_for_test_;
+
   DISALLOW_COPY_AND_ASSIGN(MetroViewerProcessHost);
 };