Don't call COM stuff in the renderer...

chrome/renderer/render_thread.cc

 // Copyright (c) 2006-2008 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/renderer/render_thread.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 82 matching lines @@
 
 void RenderThread::SendHistograms() {
   return histogram_snapshots_->SendHistograms();
 }
 
 static WebAppCacheContext* CreateAppCacheContextForRenderer() {
   return new AppCacheContextImpl(RenderThread::current());
 }
 
 void RenderThread::Init() {
-  // TODO(darin): Why do we need COM here?  This is probably bogus. Perhaps
-  // this is for InProcessPlugin support?
 #if defined(OS_WIN)
-  // The renderer thread should wind-up COM.
-  CoInitialize(0);
+  // The renderer thread should wind-up COM, if not in the sandbox.

[jam, 2009/04/16 03:31:40]

nit: I would make the comment (and the one below) have to do with plugins
instead of the sandbox, since if there were no plugins, you wouldn't need this
call...

+  if (RenderProcess::InProcessPlugins())
+    CoInitialize(0);
 #endif
 
   ChildThread::Init();
   notification_service_.reset(new NotificationService);
   cache_stats_factory_.reset(
       new ScopedRunnableMethodFactory<RenderThread>(this));
 
   visited_link_slave_.reset(new VisitedLinkSlave());
   user_script_slave_.reset(new UserScriptSlave());
   dns_master_.reset(new RenderDnsMaster());
@@ skipping 18 matching lines @@
   }
 
   notification_service_.reset();
 
   ChildThread::CleanUp();
 
   // TODO(port)
 #if defined(OS_WIN)
   // Clean up plugin channels before this thread goes away.
   PluginChannelBase::CleanupChannels();
-#endif
-
-#if defined(OS_WIN)
-  CoUninitialize();
+  // Don't call COM if the renderer is in the sandbox.
+  if (RenderProcess::InProcessPlugins())
+    CoUninitialize();
 #endif
 }
 
 void RenderThread::OnUpdateVisitedLinks(base::SharedMemoryHandle table) {
   DCHECK(base::SharedMemory::IsHandleValid(table)) << "Bad table handle";
   visited_link_slave_->Init(table);
 }
 
 void RenderThread::OnUpdateUserScripts(
     base::SharedMemoryHandle scripts) {
@@ skipping 154 matching lines @@
 }
 
 void RenderThread::OnExtensionHandleConnect(int port_id) {
   RendererExtensionBindings::HandleConnect(port_id);
 }
 
 void RenderThread::OnExtensionHandleMessage(const std::string& message,
                                             int port_id) {
   RendererExtensionBindings::HandleMessage(message, port_id);
 }