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

content/browser/accessibility/cross_platform_accessibility_browsertest.cc

Index: content/browser/accessibility/cross_platform_accessibility_browsertest.cc
===================================================================
--- content/browser/accessibility/cross_platform_accessibility_browsertest.cc	(revision 159813)
+++ content/browser/accessibility/cross_platform_accessibility_browsertest.cc	(working copy)
@@ -19,6 +19,7 @@
 #if defined(OS_WIN)
 #include <atlbase.h>
 #include <atlcom.h>
+#include "base/win/scoped_com_initializer.h"
 #include "ui/base/win/atl_module.h"
 #endif
 
@@ -66,19 +67,26 @@
                  const AccessibilityNodeData::IntAttribute attr);
   bool GetBoolAttr(const AccessibilityNodeData& node,
                    const AccessibilityNodeData::BoolAttribute attr);
+
+ private:
+#if defined(OS_WIN)
+  scoped_ptr<base::win::ScopedCOMInitializer> com_initializer_;
+#endif
+
+  DISALLOW_COPY_AND_ASSIGN(CrossPlatformAccessibilityBrowserTest);
 };
 
 void CrossPlatformAccessibilityBrowserTest::SetUpInProcessBrowserTestFixture() {
 #if defined(OS_WIN)
   ui::win::CreateATLModuleIfNeeded();
-  ::CoInitialize(NULL);
+  com_initializer_.reset(new base::win::ScopedCOMInitializer());
 #endif
 }
 
 void
 CrossPlatformAccessibilityBrowserTest::TearDownInProcessBrowserTestFixture() {
 #if defined(OS_WIN)
-  ::CoUninitialize();
+  com_initializer_.reset();
 #endif
 }