Introduce the ability to wait for the watcher process to initialize.

components/browser_watcher/watcher_client_win_unittest.cc

 // Copyright (c) 2014 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 "components/browser_watcher/watcher_client_win.h"
 
 #include <string>
 
 #include "base/base_switches.h"
 #include "base/bind.h"
@@ skipping 119 matching lines @@
 
     return ret;
   }
 
   WatcherClient::CommandLineGenerator GetBaseCommandLineGenerator(
       HandlePolicy handle_policy) {
     return base::Bind(&WatcherClientTest::GetBaseCommandLine,
                       base::Unretained(this), handle_policy);
   }
 
-  void AssertSuccessfulExitCode(base::ProcessHandle handle) {
-    ASSERT_NE(base::kNullProcessHandle, handle);
-
-    // Duplicate the process handle to work around the fact that
-    // WaitForExitCode closes it(!!!).
-    base::ProcessHandle dupe = NULL;
-    ASSERT_TRUE(::DuplicateHandle(base::GetCurrentProcessHandle(),
-                                  handle,
-                                  base::GetCurrentProcessHandle(),
-                                  &dupe,
-                                  SYNCHRONIZE | PROCESS_QUERY_INFORMATION,
-                                  FALSE,
-                                  0));
-    ASSERT_NE(base::kNullProcessHandle, dupe);
+  void AssertSuccessfulExitCode(base::Process process) {
+    ASSERT_TRUE(process.IsValid());
     int exit_code = 0;
-    if (!base::WaitForExitCode(dupe, &exit_code)) {
-      base::CloseProcessHandle(dupe);
-      FAIL() << "WaitForExitCode failed.";
-    }
+    if (!process.WaitForExit(&exit_code))
+      FAIL() << "Process::WaitForExit failed.";
     ASSERT_EQ(0, exit_code);
   }
 
   // Inheritable process handle used for testing.
   base::win::ScopedHandle self_;
 };
 
 }  // namespace
 
 // TODO(siggi): More testing - test WatcherClient base implementation.
 
 TEST_F(WatcherClientTest, LaunchWatcherSucceeds) {
   // We can only use the non-legacy launch method on Windows Vista or better.
   if (base::win::GetVersion() < base::win::VERSION_VISTA)
     return;
 
   WatcherClient client(GetBaseCommandLineGenerator(NO_LEAK_HANDLE));
   ASSERT_FALSE(client.use_legacy_launch());
 
   client.LaunchWatcher();
 
-  ASSERT_NO_FATAL_FAILURE(AssertSuccessfulExitCode(client.process()));
+  ASSERT_NO_FATAL_FAILURE(
+      AssertSuccessfulExitCode(client.process().Duplicate()));
 }
 
 TEST_F(WatcherClientTest, LaunchWatcherLegacyModeSucceeds) {
   // Test the XP-compatible legacy launch mode. This is expected to leak
   // a handle to the child process.
   WatcherClient client(GetBaseCommandLineGenerator(LEAK_HANDLE));
 
   // Use the legacy launch mode.
   client.set_use_legacy_launch(true);
 
   client.LaunchWatcher();
 
-  ASSERT_NO_FATAL_FAILURE(AssertSuccessfulExitCode(client.process()));
+  ASSERT_NO_FATAL_FAILURE(
+      AssertSuccessfulExitCode(client.process().Duplicate()));
 }
 
 TEST_F(WatcherClientTest, LegacyModeDetectedOnXP) {
   // This test only works on Windows XP.
   if (base::win::GetVersion() > base::win::VERSION_XP)
     return;
 
   // Test that the client detects the need to use legacy launch mode, and that
   // it works on Windows XP.
   WatcherClient client(GetBaseCommandLineGenerator(LEAK_HANDLE));
   ASSERT_TRUE(client.use_legacy_launch());
 
   client.LaunchWatcher();
 
-  ASSERT_NO_FATAL_FAILURE(AssertSuccessfulExitCode(client.process()));
+  ASSERT_NO_FATAL_FAILURE(
+      AssertSuccessfulExitCode(client.process().Duplicate()));
 }
 
 }  // namespace browser_watcher