Revert of https://codereview.chromium.org/71013004/

Reason for revert: Causing compile failure in chrome_util.cc on "Google Chrome Win" http://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20Win/builds/21803

TBR=cpu@chromium.org,jvoung@chromium.org,thakis@chromium.org,sergeyu@chromium.org,grt@chromium.org,gene@chromium.org,youngki@chromium.org,rvargas@chromium.org
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/90963002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237541 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 10 insertions, 12 deletions

diff --git a/cloud_print/service/win/chrome_launcher.cc b/cloud_print/service/win/chrome_launcher.cc
index 35d760e..51501df 100644
--- a/cloud_print/service/win/chrome_launcher.cc
+++ b/cloud_print/service/win/chrome_launcher.cc
@@ -67,23 +67,22 @@ void CloseChrome(HANDLE process, DWORD 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();
@@ -241,7 +240,7 @@ void ChromeLauncher::Run() {
       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;
@@ -318,7 +317,7 @@ std::string ChromeLauncher::CreateServiceStateFile(
 
   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;
   }
diff --git a/cloud_print/virtual_driver/win/install/setup.cc b/cloud_print/virtual_driver/win/install/setup.cc
index 1c87ca2..6e0df24 100644
--- a/cloud_print/virtual_driver/win/install/setup.cc
+++ b/cloud_print/virtual_driver/win/install/setup.cc
@@ -97,7 +97,7 @@ void SpoolerServiceCommand(const char* command) {
   base::LaunchOptions options;
   options.wait = true;
   options.start_hidden = true;
-  VLOG(0) << command_line.GetCommandLineString();
+  LOG(INFO) << command_line.GetCommandLineString();
   base::LaunchProcess(command_line, options, NULL);
 }
 
@@ -140,8 +140,7 @@ HRESULT RegisterPortMonitor(bool install, const base::FilePath& install_path) {
   options.wait = true;
 
   base::win::ScopedHandle regsvr32_handle;
-  if (!base::LaunchProcess(command_line.GetCommandLineString(), options,
-                           &regsvr32_handle)) {
+  if (!base::LaunchProcess(command_line, options, regsvr32_handle.Receive())) {
     LOG(ERROR) << "Unable to launch regsvr32.exe.";
     return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
   }
@@ -541,8 +540,8 @@ int WINAPI WinMain(__in  HINSTANCE hInstance,
   CommandLine::Init(0, NULL);
   HRESULT retval = cloud_print::ExecuteCommands();
 
-  VLOG(0) << _com_error(retval).ErrorMessage() << " HRESULT=0x" <<
-            std::setbase(16) << retval;
+  LOG(INFO) << _com_error(retval).ErrorMessage() << " HRESULT=0x" <<
+               std::setbase(16) << retval;
 
   // Installer is silent by default as required by Google Update.
   if (CommandLine::ForCurrentProcess()->HasSwitch("verbose")) {