Use ScopedCOMInitializer in more places. While this doesn't always simplify code, it does mean we do consistent logging and error-checking at all these sites.

BUG=none
TEST=none
Review URL: https://codereview.chromium.org/11050009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159908 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 7 deletions

diff --git a/ui/base/dialogs/base_shell_dialog_win.cc b/ui/base/dialogs/base_shell_dialog_win.cc
index 8d6072d..fa339cb 100644
--- a/ui/base/dialogs/base_shell_dialog_win.cc
+++ b/ui/base/dialogs/base_shell_dialog_win.cc
@@ -7,6 +7,7 @@
 #include <algorithm>
 
 #include "base/threading/thread.h"
+#include "base/win/scoped_com_initializer.h"
 
 namespace {
 
@@ -17,11 +18,12 @@ class ShellDialogThread : public base::Thread {
   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);
 };
 
@@ -30,14 +32,11 @@ ShellDialogThread::~ShellDialogThread() {
 }
 
 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