Merge 237541 "Revert of https://codereview.chromium.org/71013004/"

cloud_print/service/win/chrome_launcher.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 "cloud_print/service/win/chrome_launcher.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
@@ skipping 49 matching lines @@
 // Close Chrome browser window.
 void CloseChrome(HANDLE process, DWORD thread_id) {
   CloseAllProcessWindows(process);
   if (WAIT_OBJECT_0 == ::WaitForSingleObject(process, kShutdownTimeoutMs)) {
     return;
   }
   ShutdownChrome(process, thread_id);
 }
 
 bool LaunchProcess(const CommandLine& cmdline,
-                   base::win::ScopedHandle* process_handle,
+                   base::ProcessHandle* process_handle,
                    DWORD* thread_id) {
   STARTUPINFO startup_info = {};
   startup_info.cb = sizeof(startup_info);
   startup_info.dwFlags = STARTF_USESHOWWINDOW;
   startup_info.wShowWindow = SW_SHOW;
 
-  PROCESS_INFORMATION temp_process_info = {};
+  base::win::ScopedProcessInformation process_info;
   if (!CreateProcess(NULL,
       const_cast<wchar_t*>(cmdline.GetCommandLineString().c_str()), NULL, NULL,
-      FALSE, 0, NULL, NULL, &startup_info, &temp_process_info)) {
+      FALSE, 0, NULL, NULL, &startup_info, process_info.Receive())) {
     return false;
   }
-  base::win::ScopedProcessInformation process_info(temp_process_info);
 
   if (process_handle)
-    process_handle->Set(process_info.TakeProcessHandle());
+    *process_handle = process_info.TakeProcessHandle();
 
   if (thread_id)
     *thread_id = process_info.thread_id();
 
   return true;
 }
 
 GURL GetCloudPrintServiceEnableURL(const std::string& proxy_id) {
   GURL url(
       CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
@@ skipping 137 matching lines @@
       cmd.AppendSwitch(switches::kDisableExtensions);
       cmd.AppendSwitch(switches::kDisableGpu);
       cmd.AppendSwitch(switches::kDisableSoftwareRasterizer);
       cmd.AppendSwitch(switches::kDisableSync);
       cmd.AppendSwitch(switches::kNoFirstRun);
       cmd.AppendSwitch(switches::kNoStartupWindow);
 
       base::win::ScopedHandle chrome_handle;
       base::Time started = base::Time::Now();
       DWORD thread_id = 0;
-      LaunchProcess(cmd, &chrome_handle, &thread_id);
+      LaunchProcess(cmd, chrome_handle.Receive(), &thread_id);
 
       HANDLE handles[] = {stop_event_.handle(), chrome_handle};
       DWORD wait_result = WAIT_TIMEOUT;
       while (wait_result == WAIT_TIMEOUT) {
         cloud_print::SetGoogleUpdateUsage(kGoogleUpdateId);
         wait_result = ::WaitForMultipleObjects(arraysize(handles), handles,
                                                FALSE, kUsageUpdateTimeoutMs);
       }
       if (wait_result == WAIT_OBJECT_0) {
         ShutdownChrome(chrome_handle, thread_id);
@@ skipping 56 matching lines @@
   cmd.AppendSwitch(switches::kDisableDefaultApps);
   cmd.AppendSwitch(switches::kDisableExtensions);
   cmd.AppendSwitch(switches::kDisableSync);
   cmd.AppendSwitch(switches::kNoDefaultBrowserCheck);
   cmd.AppendSwitch(switches::kNoFirstRun);
 
   cmd.AppendArg(GetCloudPrintServiceEnableURLWithSignin(proxy_id).spec());
 
   base::win::ScopedHandle chrome_handle;
   DWORD thread_id = 0;
-  if (!LaunchProcess(cmd, &chrome_handle, &thread_id)) {
+  if (!LaunchProcess(cmd, chrome_handle.Receive(), &thread_id)) {
     LOG(ERROR) << "Unable to launch Chrome.";
     return result;
   }
 
   for (;;) {
     DWORD wait_result = ::WaitForSingleObject(chrome_handle, 500);
     std::string json = ReadAndUpdateServiceState(temp_user_data.path(),
                                                  proxy_id);
     if (wait_result == WAIT_OBJECT_0) {
       // Return what we have because browser is closed.
       return json;
     } else if (wait_result == WAIT_TIMEOUT) {
       if (!json.empty()) {
         // Close chrome because Service State is ready.
         CloseChrome(chrome_handle, thread_id);
         return json;
       }
     } else {
       LOG(ERROR) << "Chrome launch failed.";
       return result;
     }
   }
   NOTREACHED();
   return std::string();
 }