Miscellaneous tiny cleanups done while converting files to use ScopedCOMInitializer, pulled out sep…

chrome_frame/update_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 "chrome_frame/update_launcher.h"
 
 #include <windows.h>
 #include <Shellapi.h>
 
 #include "google_update/google_update_idl.h"
 
 namespace {
 
 const wchar_t kChromeFrameGuid[] = L"{8BA986DA-5100-405E-AA35-86F34A02ACBF}";
 
 const DWORD kLaunchFailureExitCode = 0xFF;
 
 const wchar_t kUpdateCommandFlag[] = L"--update-cmd";
 
 // Waits indefinitely for the provided process to exit. Returns the process's
 // exit code, or kLaunchFailureExitCode if an error occurs in the waiting.
 DWORD WaitForProcessExitCode(HANDLE handle) {
   DWORD exit_code = 0;
-
-  DWORD wait_result = ::WaitForSingleObject(handle, INFINITE);
-
-  if (wait_result == WAIT_OBJECT_0 && ::GetExitCodeProcess(handle, &exit_code))
-    return exit_code;
-
-  return kLaunchFailureExitCode;
+  return ((::WaitForSingleObject(handle, INFINITE) == WAIT_OBJECT_0) &&
+          ::GetExitCodeProcess(handle, &exit_code)) ?
+      exit_code : kLaunchFailureExitCode;
 }
 
 }  // namespace
 
 namespace update_launcher {
 
 std::wstring GetUpdateCommandFromArguments(const wchar_t* command_line) {
   std::wstring command;
 
   if (command_line != NULL) {
@@ skipping 44 matching lines @@
     if (ipl)
       ipl->Release();
 
     ::CoUninitialize();
   }
 
   return exit_code;
 }
 
 }  // namespace process_launcher