Allow Thread to initialize COM for Windows consumers who need it

chrome_frame/urlmon_url_request.cc

Index: chrome_frame/urlmon_url_request.cc
===================================================================
--- chrome_frame/urlmon_url_request.cc	(revision 162015)
+++ chrome_frame/urlmon_url_request.cc	(working copy)
@@ -15,6 +15,7 @@
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "base/threading/platform_thread.h"
+#include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/automation_messages.h"
 #include "chrome_frame/bind_context_info.h"
@@ -1401,8 +1402,10 @@
       privileged_mode_(false),
       container_(NULL),
       background_worker_thread_enabled_(true) {
-  background_thread_.reset(new ResourceFetcherThread(
-      "cf_iexplore_background_thread"));
+  background_thread_.reset(new base::Thread("cf_iexplore_background_thread"));
+#if defined(OS_WIN)

[ananta, 2012/10/16 01:26:43]

We don't need the OS_WIN check here? as CF is windows specific

[Peter Kasting, 2012/10/16 01:42:10]

Good point.

+  background_thread_->init_com_with_mta(false);
+#endif
   background_worker_thread_enabled_ =
       GetConfigBool(true, kUseBackgroundThreadForSubResources);
   if (background_worker_thread_enabled_) {
@@ -1445,19 +1448,3 @@
                 0);
   }
 }
-
-UrlmonUrlRequestManager::ResourceFetcherThread::ResourceFetcherThread(
-    const char* name) : base::Thread(name) {
-}
-
-UrlmonUrlRequestManager::ResourceFetcherThread::~ResourceFetcherThread() {
-  Stop();
-}
-
-void UrlmonUrlRequestManager::ResourceFetcherThread::Init() {
-  com_initializer_.reset(new base::win::ScopedCOMInitializer());
-}
-
-void UrlmonUrlRequestManager::ResourceFetcherThread::CleanUp() {
-  com_initializer_.reset();
-}