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

chrome_frame/ready_mode/internal/registry_ready_mode_state.cc

 // Copyright (c) 2011 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_frame/ready_mode/internal/registry_ready_mode_state.h"
 
 #include <windows.h>
 
 #include "base/logging.h"
 #include "base/process/launch.h"
@@ skipping 22 matching lines @@
 
   HKEY roots[] = {HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE};
 
   for (int i = 0; i < arraysize(roots); i++) {
     base::win::RegKey version_key;
     if (version_key.Open(roots[i], version_key_name.c_str(),
                          KEY_QUERY_VALUE) == ERROR_SUCCESS) {
       std::wstring command_line;
       if (version_key.ReadValue(command_field.c_str(),
                                 &command_line) == ERROR_SUCCESS) {
-        base::win::ScopedHandle launched_process;
+        HANDLE launched_process = NULL;
         base::LaunchOptions options;
         options.start_hidden = true;
         if (base::LaunchProcess(command_line, options, &launched_process)) {
-          return launched_process.Take();
+          return launched_process;
         }
       }
     }
   }
   return NULL;
 }
 
 // Attempts to launch a command using the ProcessLauncher. Returns a handle to
 // the launched process, which the caller is responsible for closing, or NULL
 // upon failure.
@@ skipping 187 matching lines @@
 
 void RegistryReadyModeState::PermanentlyDeclineChromeFrame() {
   if (LaunchAndCheckCommand(google_update::kRegCFOptOutCmdField))
     RefreshStateAndNotify();
 }
 
 void RegistryReadyModeState::AcceptChromeFrame() {
   if (LaunchAndCheckCommand(google_update::kRegCFOptInCmdField))
     NotifyObserver();
 }