Use ScopedCOMInitializer in more places. While this doesn't always simplify code, it does mean we …

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();
 
- protected:
+ private:
    void Init();
    void CleanUp();
 
- private:
+  scoped_ptr<base::win::ScopedCOMInitializer> com_initializer_;
+
   DISALLOW_COPY_AND_ASSIGN(ShellDialogThread);
 };
 
 ShellDialogThread::~ShellDialogThread() {
   Stop();
 }
 
 void ShellDialogThread::Init() {
-  // Initializes the COM library on the current thread.
-  CoInitialize(NULL);
+  com_initializer_.reset(new base::win::ScopedCOMInitializer());
 }
 
 void ShellDialogThread::CleanUp() {
-  // Closes the COM library on the current thread. CoInitialize must
-  // be balanced by a corresponding call to CoUninitialize.
-  CoUninitialize();
+  com_initializer_.reset();
 }
 
 }  // namespace
 
 namespace ui {
 
 // static
 BaseShellDialogImpl::Owners BaseShellDialogImpl::owners_;
 int BaseShellDialogImpl::instance_count_ = 0;
 
@@ skipping 50 matching lines @@
   DCHECK(started);
   return thread;
 }
 
 void BaseShellDialogImpl::EnableOwner(HWND owner) {
   if (IsWindow(owner))
     EnableWindow(owner, TRUE);
 }
 
 }  // namespace ui