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

content/browser/browser_process_sub_thread.h

 // 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.
 
 #ifndef CONTENT_BROWSER_BROWSER_PROCESS_SUB_THREAD_H_
 #define CONTENT_BROWSER_BROWSER_PROCESS_SUB_THREAD_H_
 
 #include "base/basictypes.h"
 #include "content/browser/browser_thread_impl.h"
 #include "content/common/content_export.h"
 
+#if defined(OS_WIN)
+namespace base {
+namespace win {
+class ScopedCOMInitializer;
+}
+}
+#endif
+
 namespace content {
 class NotificationService;
 }
 
 namespace content {
 
 // ----------------------------------------------------------------------------
 // BrowserProcessSubThread
 //
 // This simple thread object is used for the specialized threads that the
 // BrowserProcess spins up.
 //
 // Applications must initialize the COM library before they can call
 // COM library functions other than CoGetMalloc and memory allocation
 // functions, so this class initializes COM for those users.
 class CONTENT_EXPORT BrowserProcessSubThread : public BrowserThreadImpl {
  public:
   explicit BrowserProcessSubThread(BrowserThread::ID identifier);
   virtual ~BrowserProcessSubThread();
 
  protected:
   virtual void Init() OVERRIDE;
   virtual void CleanUp() OVERRIDE;
 
  private:
   // These methods encapsulate cleanup that needs to happen on the IO thread
   // before we call the embedder's CleanUp function.
   void IOThreadPreCleanUp();
 
+#if defined (OS_WIN)
+  scoped_ptr<base::win::ScopedCOMInitializer> com_initializer_;
+#endif
+
   // Each specialized thread has its own notification service.
   scoped_ptr<NotificationService> notification_service_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserProcessSubThread);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_BROWSER_PROCESS_SUB_THREAD_H_