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

remoting/host/setup/daemon_controller_win.cc

Index: remoting/host/setup/daemon_controller_win.cc
===================================================================
--- remoting/host/setup/daemon_controller_win.cc	(revision 159813)
+++ remoting/host/setup/daemon_controller_win.cc	(working copy)
@@ -22,6 +22,7 @@
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "base/win/scoped_bstr.h"
+#include "base/win/scoped_com_initializer.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/windows_version.h"
 #include "remoting/base/scoped_sc_handle_win.h"
@@ -71,10 +72,12 @@
 
   bool Start();
 
- protected:
+ private:
   virtual void Init() OVERRIDE;
   virtual void CleanUp() OVERRIDE;
 
+  scoped_ptr<base::win::ScopedCOMInitializer> com_initializer_;
+
   DISALLOW_COPY_AND_ASSIGN(ComThread);
 };
 
@@ -183,11 +186,11 @@
 }
 
 void ComThread::Init() {
-  CoInitialize(NULL);
+  com_initializer_.reset(new base::win::ScopedCOMInitializer());
 }
 
 void ComThread::CleanUp() {
-  CoUninitialize();
+  com_initializer_.reset();
 }
 
 DaemonControllerWin::DaemonControllerWin()