Change RenderThread to use ScopedCOMInitializer to initialize COM.

content/renderer/render_thread_impl.h

 // Copyright (c) 2011 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_RENDERER_RENDER_THREAD_IMPL_H_
 #define CONTENT_RENDERER_RENDER_THREAD_IMPL_H_
 #pragma once
 
 #include <set>
 #include <string>
@@ skipping 38 matching lines @@
 struct ChannelHandle;
 }
 
 namespace WebKit {
 class WebStorageEventDispatcher;
 }
 
 namespace base {
 class MessageLoopProxy;
 class Thread;
+namespace win {
+class ScopedCOMInitializer;
+}
 }
 
 namespace content {
 class RenderProcessObserver;
 }
 
 namespace v8 {
 class Extension;
 }
 
@@ skipping 134 matching lines @@
   scoped_refptr<AudioInputMessageFilter> audio_input_message_filter_;
   scoped_refptr<AudioMessageFilter> audio_message_filter_;
   scoped_refptr<DevToolsAgentFilter> devtools_agent_message_filter_;
 
   // Used on multiple threads.
   scoped_refptr<VideoCaptureImplManager> vc_manager_;
 
   // Used on multiple script execution context threads.
   scoped_ptr<WebDatabaseObserverImpl> web_database_observer_impl_;
 
+  // Initialize COM when using plugins outside the sandbox (Windows only).
+  scoped_ptr<base::win::ScopedCOMInitializer> initialize_com_;
+
   // If true, then a GetPlugins call is allowed to rescan the disk.
   bool plugin_refresh_allowed_;
 
   // The count of RenderWidgets running through this thread.
   int widget_count_;
 
   // The count of hidden RenderWidgets running through this thread.
   int hidden_widget_count_;
 
   // The current value of the idle notification timer delay.
@@ skipping 15 matching lines @@
   std::set<std::string> v8_extensions_;
 
   scoped_ptr<CompositorThread> compositor_thread_;
 
   ObserverList<content::RenderProcessObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderThreadImpl);
 };
 
 #endif  // CONTENT_RENDERER_RENDER_THREAD_IMPL_H_