Use ScopedCOMInitializer in more places. While this doesn't always simplify code, it does mean we do consistent logging and error-checking at all these sites.

BUG=none
TEST=none
Review URL: https://codereview.chromium.org/11050009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159908 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 8 deletions

diff --git a/chrome_frame/update_launcher.cc b/chrome_frame/update_launcher.cc
index b2d23123..439626d 100644
--- a/chrome_frame/update_launcher.cc
+++ b/chrome_frame/update_launcher.cc
@@ -7,6 +7,7 @@
 #include <windows.h>
 #include <Shellapi.h>
 
+#include "base/win/scoped_com_initializer.h"
 #include "google_update/google_update_idl.h"
 
 namespace {
@@ -54,15 +55,14 @@ std::wstring GetUpdateCommandFromArguments(const wchar_t* command_line) {
 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;
@@ -80,8 +80,6 @@ DWORD LaunchUpdateCommand(const std::wstring& command) {
       ::CloseHandle(process);
     if (ipl)
       ipl->Release();
-
-    ::CoUninitialize();
   }
 
   return exit_code;