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

content/browser/accessibility/browser_accessibility_win_unittest.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 "base/memory/scoped_ptr.h"
+#include "base/win/scoped_com_initializer.h"
 #include "base/win/scoped_comptr.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 #include "content/browser/accessibility/browser_accessibility_win.h"
 #include "content/common/accessibility_messages.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/win/atl_module.h"
 
 using content::AccessibilityNodeData;
 
 namespace {
@@ skipping 28 matching lines @@
 VARIANT CreateI4Variant(LONG value) {
   VARIANT variant = {0};
 
   V_VT(&variant) = VT_I4;
   V_I4(&variant) = value;
 
   return variant;
 }
 
 class BrowserAccessibilityTest : public testing::Test {
- protected:
+ public:
+  BrowserAccessibilityTest() {}
+
+ private:
   virtual void SetUp() {
     ui::win::CreateATLModuleIfNeeded();
-    ::CoInitialize(NULL);
   }
 
-  virtual void TearDown() {
-    ::CoUninitialize();
-  }
+  base::win::ScopedCOMInitializer com_initializer_;
+
+  DISALLOW_COPY_AND_ASSIGN(BrowserAccessibilityTest);
 };
 
 // Test that BrowserAccessibilityManager correctly releases the tree of
 // BrowserAccessibility instances upon delete.
 TEST_F(BrowserAccessibilityTest, TestNoLeaks) {
   // Create AccessibilityNodeData objects for a simple document tree,
   // representing the accessibility information used to initialize
   // BrowserAccessibilityManager.
   AccessibilityNodeData button;
   button.id = 2;
@@ skipping 455 matching lines @@
   EXPECT_EQ(S_OK, root_obj->get_hyperlinkIndex(14, &hyperlink_index));
   EXPECT_EQ(0, hyperlink_index);
   EXPECT_EQ(S_OK, root_obj->get_hyperlinkIndex(30, &hyperlink_index));
   EXPECT_EQ(1, hyperlink_index);
 
   // Delete the manager and test that all BrowserAccessibility instances are
   // deleted.
   delete manager;
   ASSERT_EQ(0, CountedBrowserAccessibility::global_obj_count_);
 }