Chromium roll (https://codereview.chromium.org/976353002)

base/win/scoped_process_information_unittest.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 <windows.h>
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/process/kill.h"
+#include "base/process/process.h"
 #include "base/test/multiprocess_test.h"
 #include "base/win/scoped_process_information.h"
 #include "testing/multiprocess_func_list.h"
 
 namespace {
 
 const DWORD kProcessId = 4321;
 const DWORD kThreadId = 1234;
 const HANDLE kProcessHandle = reinterpret_cast<HANDLE>(7651);
 const HANDLE kThreadHandle = reinterpret_cast<HANDLE>(1567);
@@ skipping 107 matching lines @@
   duplicate.DuplicateFrom(process_info);
 
   ASSERT_TRUE(process_info.IsValid());
   ASSERT_NE(0u, process_info.process_id());
   ASSERT_EQ(duplicate.process_id(), process_info.process_id());
   ASSERT_NE(0u, process_info.thread_id());
   ASSERT_EQ(duplicate.thread_id(), process_info.thread_id());
 
   // Validate that we have separate handles that are good.
   int exit_code = 0;
-  ASSERT_TRUE(base::WaitForExitCode(process_info.TakeProcessHandle(),
-                                    &exit_code));
+  base::Process process(process_info.TakeProcessHandle());
+  ASSERT_TRUE(process.WaitForExit(&exit_code));
   ASSERT_EQ(7, exit_code);
 
   exit_code = 0;
-  ASSERT_TRUE(base::WaitForExitCode(duplicate.TakeProcessHandle(),
-                                    &exit_code));
+  base::Process dup_process(duplicate.TakeProcessHandle());
+  ASSERT_TRUE(dup_process.WaitForExit(&exit_code));
   ASSERT_EQ(7, exit_code);
 
   ASSERT_TRUE(::CloseHandle(process_info.TakeThreadHandle()));
   ASSERT_TRUE(::CloseHandle(duplicate.TakeThreadHandle()));
 }
 
 TEST_F(ScopedProcessInformationTest, Set) {
   base::win::ScopedProcessInformation base_process_info;
   MockCreateProcess(&base_process_info);
 
   PROCESS_INFORMATION base_struct = base_process_info.Take();
 
   base::win::ScopedProcessInformation process_info;
   process_info.Set(base_struct);
 
   EXPECT_EQ(kProcessId, process_info.process_id());
   EXPECT_EQ(kThreadId, process_info.thread_id());
   EXPECT_EQ(kProcessHandle, process_info.process_handle());
   EXPECT_EQ(kThreadHandle, process_info.thread_handle());
   base_struct = process_info.Take();
 }