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

cloud_print/virtual_driver/win/install/setup.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 <comdef.h>
 #include <iomanip>
 #include <windows.h>
 #include <winspool.h>
 #include <setupapi.h>  // Must be included after windows.h
 
@@ skipping 79 matching lines @@
   if (net_path.empty())
     return;
   CommandLine command_line(net_path);
   command_line.AppendArg(command);
   command_line.AppendArg("spooler");
   command_line.AppendArg("/y");
 
   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);
 }
 
 HRESULT RegisterPortMonitor(bool install, const base::FilePath& install_path) {
   DCHECK(install || install_path.empty());
   base::FilePath target_path = GetNativeSystemPath(GetPortMonitorDllName());
   if (target_path.empty()) {
     LOG(ERROR) << "Unable to get port monitor target path.";
     return HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND);
   }
@@ skipping 22 matching lines @@
     command_line.AppendArg("/u");
   }
 
   // Use system32 path here because otherwise ::AddMonitor would fail.
   command_line.AppendArgPath(GetSystemPath(GetPortMonitorDllName()));
 
   base::LaunchOptions options;
   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);
   }
 
   DWORD exit_code = S_OK;
   if (install) {
     if (!GetExitCodeProcess(regsvr32_handle, &exit_code)) {
       LOG(ERROR) << "Unable to get regsvr32.exe exit code.";
       return GetLastHResult();
     }
@@ skipping 379 matching lines @@
 }  // namespace cloud_print
 
 int WINAPI WinMain(__in  HINSTANCE hInstance,
                    __in  HINSTANCE hPrevInstance,
                    __in  LPSTR lpCmdLine,
                    __in  int nCmdShow) {
   base::AtExitManager at_exit_manager;
   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")) {
     cloud_print::DisplayWindowsMessage(NULL, retval,
         cloud_print::LoadLocalString(IDS_DRIVER_NAME));
   }
   return retval;
 }