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

chrome_frame/test/reliability/reliability_test_suite.h

Index: chrome_frame/test/reliability/reliability_test_suite.h
===================================================================
--- chrome_frame/test/reliability/reliability_test_suite.h	(revision 159813)
+++ chrome_frame/test/reliability/reliability_test_suite.h	(working copy)
@@ -5,8 +5,7 @@
 #ifndef CHROME_FRAME_TEST_RELIABILITY_RELIABILITY_TEST_SUITE_H_
 #define CHROME_FRAME_TEST_RELIABILITY_RELIABILITY_TEST_SUITE_H_
 
-#include <objbase.h>
-
+#include "base/win/scoped_com_initializer.h"
 #include "chrome_frame/test/reliability/page_load_test.h"
 #include "chrome/test/ui/ui_test_suite.h"
 
@@ -15,17 +14,22 @@
   ReliabilityTestSuite(int argc, char** argv) : UITestSuite(argc, argv) {
   }
 
- protected:
+ private:
   virtual void Initialize() {

[grt (UTC plus 2), 2012/10/03 13:37:28]

OVERRIDE

-    CoInitializeEx(NULL, COINIT_MULTITHREADED);
+    com_initializer_.reset(new base::win::ScopedCOMInitializer(
+        base::win::ScopedCOMInitializer::kMTA));
     SetPageRange(*CommandLine::ForCurrentProcess());
     UITestSuite::Initialize();
   }
 
   virtual void Shutdown() {

[grt (UTC plus 2), 2012/10/03 13:37:28]

OVERRIDE

-    CoUninitialize();
     UITestSuite::Shutdown();
+    com_initializer_.reset();
   }
+
+  scoped_ptr<base::win::ScopedCOMInitializer> com_initializer_;
+
+  DISALLOW_COPY_AND_ASSIGN(ReliabilityTestSuite);
 };
 
 #endif  // CHROME_FRAME_TEST_RELIABILITY_RELIABILITY_TEST_SUITE_H_