Move OpenProcessHandleWithAccess to Process::OpenWithAccess.

chrome/browser/service_process/service_process_control_browsertest.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 "chrome/browser/service_process/service_process_control.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/process/kill.h"
-#include "base/process/process_handle.h"
+#include "base/process/process.h"
 #include "base/process/process_iterator.h"
 #include "base/test/test_timeouts.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/service_process_util.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 class ServiceProcessControlBrowserTest
     : public InProcessBrowserTest {
  public:
-  ServiceProcessControlBrowserTest()
-      : service_process_handle_(base::kNullProcessHandle) {
+  ServiceProcessControlBrowserTest() {
   }
   virtual ~ServiceProcessControlBrowserTest() {
-    base::CloseProcessHandle(service_process_handle_);
-    service_process_handle_ = base::kNullProcessHandle;
   }
 
   void HistogramsCallback() {
     MockHistogramsCallback();
     QuitMessageLoop();
   }
 
   MOCK_METHOD0(MockHistogramsCallback, void());
 
  protected:
@@ skipping 18 matching lines @@
       const cloud_print::CloudPrintProxyInfo& proxy_info) {
     QuitMessageLoop();
   }
 
   void Disconnect() {
     // This will close the IPC connection.
     ServiceProcessControl::GetInstance()->Disconnect();
   }
 
   virtual void SetUp() override {
-    service_process_handle_ = base::kNullProcessHandle;
+    // This should not be needed because TearDown() ends with a closed
+    // service_process_, but HistogramsTimeout and Histograms fail without this
+    // on Mac.
+    service_process_.Close();
   }
 
   virtual void TearDown() override {
     if (ServiceProcessControl::GetInstance()->IsConnected())
       EXPECT_TRUE(ServiceProcessControl::GetInstance()->Shutdown());
 #if defined(OS_MACOSX)
     // ForceServiceProcessShutdown removes the process from launched on Mac.
     ForceServiceProcessShutdown("", 0);
 #endif  // OS_MACOSX
-    if (service_process_handle_ != base::kNullProcessHandle) {
+    if (service_process_.IsValid()) {
       EXPECT_TRUE(base::WaitForSingleProcess(
-          service_process_handle_,
+          service_process_.Handle(),
           TestTimeouts::action_max_timeout()));
-      service_process_handle_ = base::kNullProcessHandle;
+      service_process_.Close();
     }
   }
 
   void ProcessControlLaunched() {
     base::ProcessId service_pid;
     EXPECT_TRUE(GetServiceProcessData(NULL, &service_pid));
     EXPECT_NE(static_cast<base::ProcessId>(0), service_pid);
-    EXPECT_TRUE(base::OpenProcessHandleWithAccess(
-        service_pid,
-        base::kProcessAccessWaitForTermination |
-        // we need query permission to get exit code
-        base::kProcessAccessQueryInformation,
-        &service_process_handle_));
+#if defined(OS_WIN)
+    service_process_ =
+        base::Process::OpenWithAccess(service_pid,
+                                      SYNCHRONIZE | PROCESS_QUERY_INFORMATION);
+    EXPECT_TRUE(service_process_.IsValid());
+#else
+    base::ProcessHandle service_process_handle;
+    EXPECT_TRUE(base::OpenProcessHandle(service_pid, &service_process_handle));
+    service_process_ = base::Process(service_process_handle);
+#endif
     // Quit the current message. Post a QuitTask instead of just calling Quit()
     // because this can get invoked in the context of a Launch() call and we
     // may not be in Run() yet.
     base::MessageLoop::current()->PostTask(FROM_HERE,
                                            base::MessageLoop::QuitClosure());
   }
 
   void ProcessControlLaunchFailed() {
     ADD_FAILURE();
     // Quit the current message.
     base::MessageLoop::current()->PostTask(FROM_HERE,
                                            base::MessageLoop::QuitClosure());
   }
 
  private:
-  base::ProcessHandle service_process_handle_;
+  base::Process service_process_;
 };
 
 class RealServiceProcessControlBrowserTest
       : public ServiceProcessControlBrowserTest {
  public:
   void SetUpCommandLine(base::CommandLine* command_line) override {
     ServiceProcessControlBrowserTest::SetUpCommandLine(command_line);
     base::FilePath exe;
     PathService::Get(base::DIR_EXE, &exe);
 #if defined(OS_MACOSX)
@@ skipping 153 matching lines @@
   // Callback should not be called during GetHistograms call.
   EXPECT_CALL(*this, MockHistogramsCallback()).Times(0);
   // Wait for real callback by providing large timeout value.
   EXPECT_TRUE(ServiceProcessControl::GetInstance()->GetHistograms(
       base::Bind(&ServiceProcessControlBrowserTest::HistogramsCallback,
                 base::Unretained(this)),
       base::TimeDelta::FromHours(1)));
   EXPECT_CALL(*this, MockHistogramsCallback()).Times(1);
   content::RunMessageLoop();
 }