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

content/browser/accessibility/cross_platform_accessibility_browsertest.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 <string>
 #include <vector>
 
 #include "base/utf_string_conversions.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/test_utils.h"
 #include "content/test/content_browser_test.h"
 #include "content/test/content_browser_test_utils.h"
 #include "content/shell/shell.h"
 
 #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
 
 namespace content {
 
 class CrossPlatformAccessibilityBrowserTest : public ContentBrowserTest {
  public:
   CrossPlatformAccessibilityBrowserTest() {}
 
   // Tell the renderer to send an accessibility tree, then wait for the
@@ skipping 27 matching lines @@
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE;
   virtual void TearDownInProcessBrowserTestFixture() OVERRIDE;
 
  protected:
   std::string GetAttr(const AccessibilityNodeData& node,
                       const AccessibilityNodeData::StringAttribute attr);
   int GetIntAttr(const AccessibilityNodeData& node,
                  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
 }
 
 // Convenience method to get the value of a particular AccessibilityNodeData
 // node attribute as a UTF-8 const char*.
 std::string CrossPlatformAccessibilityBrowserTest::GetAttr(
     const AccessibilityNodeData& node,
     const AccessibilityNodeData::StringAttribute attr) {
   std::map<AccessibilityNodeData::StringAttribute, string16>::const_iterator
       iter = node.string_attributes.find(attr);
@@ skipping 358 matching lines @@
   const AccessibilityNodeData& tree = GetAccessibilityNodeDataTree();
 
   ASSERT_EQ(1U, tree.children.size());
   const AccessibilityNodeData& textbox = tree.children[0];
 
   EXPECT_EQ(
       true, GetBoolAttr(textbox, AccessibilityNodeData::ATTR_CAN_SET_VALUE));
 }
 
 }  // namespace content