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

chrome/installer/util/google_update_util.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/installer/util/google_update_util.h"
 
 #include <algorithm>
 #include <map>
 #include <utility>
 #include <vector>
@@ skipping 77 matching lines @@
 // Launches command |cmd_string|, and waits for |timeout| milliseconds before
 // timing out.  To wait indefinitely, one can set
 // |timeout| to be base::TimeDelta::FromMilliseconds(INFINITE).
 // Returns true if this executes successfully.
 // Returns false if command execution fails to execute, or times out.
 bool LaunchProcessAndWaitWithTimeout(const string16& cmd_string,
                                      base::TimeDelta timeout) {
   bool success = false;
   base::win::ScopedHandle process;
   int exit_code = 0;
-  VLOG(0) << "Launching: " << cmd_string;
+  LOG(INFO) << "Launching: " << cmd_string;
   if (!base::LaunchProcess(cmd_string, base::LaunchOptions(),
-                           &process)) {
+                           process.Receive())) {
     PLOG(ERROR) << "Failed to launch (" << cmd_string << ")";
   } else if (!base::WaitForExitCodeWithTimeout(process, &exit_code, timeout)) {
     // The GetExitCodeProcess failed or timed-out.
     LOG(ERROR) <<"Command (" << cmd_string << ") is taking more than "
                << timeout.InMilliseconds() << " milliseconds to complete.";
   } else if (exit_code != 0) {
     LOG(ERROR) << "Command (" << cmd_string << ") exited with code "
                << exit_code;
   } else {
     success = true;
@@ skipping 56 matching lines @@
       (*untrusted_data)[key] = value;
     else
       LOG(ERROR) << "Illegal character found in untrusted data.";
   }
   return true;
 }
 
 }  // namespace
 
 bool EnsureUserLevelGoogleUpdatePresent() {
-  VLOG(0) << "Ensuring Google Update is present at user-level.";
+  LOG(INFO) << "Ensuring Google Update is present at user-level.";
 
   bool success = false;
   if (IsGoogleUpdatePresent(false)) {
     success = true;
   } else {
     string16 cmd_string;
     if (!GetUserLevelGoogleUpdateInstallCommandLine(&cmd_string)) {
       LOG(ERROR) << "Cannot find Google Update at system-level.";
       // Ideally we should return false. However, this case should not be
       // encountered by regular users, and developers (who often installs
@@ skipping 27 matching lines @@
     std::map<std::string, std::string>::const_iterator data_it(
         untrusted_data.find(key));
     if (data_it != untrusted_data.end())
       return data_it->second;
   }
 
   return std::string();
 }
 
 }  // namespace google_update