Use ScopedCOMInitializer in more places. While this doesn't always simplify code, it does mean we …

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 "base/win/scoped_com_initializer.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";
 
@@ skipping 27 matching lines @@
 
   return command;
 }
 
 // Because we do not have 'base' and all of its pretty RAII helpers, please
 // ensure that this function only ever contains a single 'return', in order
 // to reduce the chance of introducing a leak.
 DWORD LaunchUpdateCommand(const std::wstring& command) {
   DWORD exit_code = kLaunchFailureExitCode;
 
-  HRESULT hr = ::CoInitialize(NULL);
-
-  if (SUCCEEDED(hr)) {
+  base::win::ScopedCOMInitializer com_initializer;
+  if (com_initializer.succeeded()) {
     IProcessLauncher* ipl = NULL;
     HANDLE process = NULL;
 
-    hr = ::CoCreateInstance(__uuidof(ProcessLauncherClass), NULL,
-                            CLSCTX_ALL, __uuidof(IProcessLauncher),
-                            reinterpret_cast<void**>(&ipl));
+    HRESULT hr = ::CoCreateInstance(__uuidof(ProcessLauncherClass), NULL,
+                                    CLSCTX_ALL, __uuidof(IProcessLauncher),
+                                    reinterpret_cast<void**>(&ipl));
 
     if (SUCCEEDED(hr)) {
       ULONG_PTR phandle = NULL;
       DWORD id = ::GetCurrentProcessId();
 
       hr = ipl->LaunchCmdElevated(kChromeFrameGuid,
                                   command.c_str(), id, &phandle);
       if (SUCCEEDED(hr)) {
         process = reinterpret_cast<HANDLE>(phandle);
         exit_code = WaitForProcessExitCode(process);
       }
     }
 
     if (process)
       ::CloseHandle(process);
     if (ipl)
       ipl->Release();
-
-    ::CoUninitialize();
   }
 
   return exit_code;
 }
 
 }  // namespace process_launcher