Allow Thread to initialize COM for Windows consumers who need it

ui/base/dialogs/base_shell_dialog_win.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 "ui/base/dialogs/base_shell_dialog_win.h"
 
 #include <algorithm>
 
 #include "base/threading/thread.h"
 #include "base/win/scoped_com_initializer.h"
 
-namespace {
-
-// Helpers to show certain types of Windows shell dialogs in a way that doesn't
-// block the UI of the entire app.
-class ShellDialogThread : public base::Thread {
- public:
-  ShellDialogThread() : base::Thread("Chrome_ShellDialogThread") { }
-  ~ShellDialogThread();
-
- private:
-   void Init();
-   void CleanUp();
-
-  scoped_ptr<base::win::ScopedCOMInitializer> com_initializer_;
-
-  DISALLOW_COPY_AND_ASSIGN(ShellDialogThread);
-};
-
-ShellDialogThread::~ShellDialogThread() {
-  Stop();
-}
-
-void ShellDialogThread::Init() {
-  com_initializer_.reset(new base::win::ScopedCOMInitializer());
-}
-
-void ShellDialogThread::CleanUp() {
-  com_initializer_.reset();
-}
-
-}  // namespace
-
 namespace ui {
 
 // static
 BaseShellDialogImpl::Owners BaseShellDialogImpl::owners_;
 int BaseShellDialogImpl::instance_count_ = 0;
 
 BaseShellDialogImpl::BaseShellDialogImpl() {
   ++instance_count_;
 }
 
@@ skipping 34 matching lines @@
   return (owner && owners_.find(owner) != owners_.end());
 }
 
 void BaseShellDialogImpl::DisableOwner(HWND owner) {
   if (IsWindow(owner))
     EnableWindow(owner, FALSE);
 }
 
 // static
 base::Thread* BaseShellDialogImpl::CreateDialogThread() {
-  base::Thread* thread = new ShellDialogThread;
+  base::Thread* thread = new base::Thread("Chrome_ShellDialogThread");
+#if defined(OS_WIN)

[grt (UTC plus 2), 2012/10/16 01:58:13]

_win.cc here, too

+  thread->init_com_with_mta(false);
+#endif
   bool started = thread->Start();
   DCHECK(started);
   return thread;
 }
 
 void BaseShellDialogImpl::EnableOwner(HWND owner) {
   if (IsWindow(owner))
     EnableWindow(owner, TRUE);
 }
 
 }  // namespace ui