Allow Thread to initialize COM for Windows consumers who need it

chrome_frame/urlmon_url_request.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 "chrome_frame/urlmon_url_request.h"
 
 #include <urlmon.h>
 #include <wininet.h>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #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"
 #include "chrome_frame/chrome_frame_activex_base.h"
 #include "chrome_frame/extra_system_apis.h"
 #include "chrome_frame/html_utils.h"
 #include "chrome_frame/urlmon_upload_data_stream.h"
 #include "chrome_frame/urlmon_url_request_private.h"
 #include "chrome_frame/utils.h"
 #include "net/base/load_flags.h"
@@ skipping 1366 matching lines @@
   if (request_map->end() != it)
     return it->second;
   return NULL;
 }
 
 UrlmonUrlRequestManager::UrlmonUrlRequestManager()
     : stopping_(false), notification_window_(NULL),
       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_) {
     base::Thread::Options options;
     options.message_loop_type = MessageLoop::TYPE_UI;
     background_thread_->StartWithOptions(options);
   }
 }
 
 UrlmonUrlRequestManager::~UrlmonUrlRequestManager() {
@@ skipping 22 matching lines @@
       privacy_info_.privacy_records[UTF8ToWide(url)];
 
   privacy_entry.flags |= flags;
   privacy_entry.policy_ref = UTF8ToWide(policy_ref);
 
   if (fire_privacy_event && IsWindow(notification_window_)) {
     PostMessage(notification_window_, WM_FIRE_PRIVACY_CHANGE_NOTIFICATION, 1,
                 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();
-}