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

content/plugin/plugin_main.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 "build/build_config.h"
 
 #if defined(OS_WIN)
-#include <objbase.h>
 #include <windows.h>
 #endif
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/hi_res_timer_manager.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/system_monitor/system_monitor.h"
 #include "base/threading/platform_thread.h"
 #include "content/common/child_process.h"
 #include "content/plugin/plugin_thread.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
 
 #if defined(OS_WIN)
+#include "base/win/scoped_com_initializer.h"
 #include "content/public/common/injection_test_win.h"
 #include "sandbox/win/src/sandbox.h"
 #elif defined(OS_POSIX) && !defined(OS_MACOSX)
 #include "base/global_descriptors_posix.h"
 #include "ipc/ipc_descriptors.h"
 #endif
 
 #if defined(OS_MACOSX)
 // Removes our Carbon library interposing from the environment so that it
 // doesn't carry into any processes that plugins might start.
@@ skipping 76 matching lines @@
 #if defined(OS_LINUX)
 
 #if defined(ARCH_CPU_64_BITS)
   WorkaroundFlashLAHF();
 #endif
 
 #elif defined(OS_WIN)
   sandbox::TargetServices* target_services =
       parameters.sandbox_info->target_services;
 
-  CoInitialize(NULL);
+  base::win::ScopedCOMInitializer com_initializer;
+
   DVLOG(1) << "Started plugin with "
            << parsed_command_line.GetCommandLineString();
 
   HMODULE sandbox_test_module = NULL;
   bool no_sandbox = parsed_command_line.HasSwitch(switches::kNoSandbox);
 
   if (target_services && !no_sandbox) {
     // The command line might specify a test plugin to load.
     if (parsed_command_line.HasSwitch(switches::kTestSandbox)) {
       std::wstring test_plugin_name =
@@ skipping 44 matching lines @@
 
       FreeLibrary(sandbox_test_module);
     }
 #endif
 
     MessageLoop::current()->Run();
   }
 
 #if defined(OS_WIN)
   DestroyIMEForFlash();
-  CoUninitialize();
 #endif
 
   return 0;
 }