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

chrome/browser/ui/views/accessibility/browser_views_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 <oleacc.h>
 
 #include "base/utf_string_conversions.h"
+#include "base/win/scoped_com_initializer.h"
 #include "base/win/scoped_comptr.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/toolbar_view.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
@@ skipping 30 matching lines @@
 
   // Retrieves and verifies the accessibility object for the given View.
   void TestViewAccessibilityObject(views::View* view,
                                    std::wstring name,
                                    int32 role);
 
   // Verifies MSAA Name and Role properties of the given IAccessible.
   void TestAccessibilityInfo(IAccessible* acc_obj,
                              std::wstring name,
                              int32 role);
+
+ private:
+  base::win::ScopedCOMInitializer com_initializer_;
+
+  DISALLOW_COPY_AND_ASSIGN(BrowserViewsAccessibilityTest);
 };
 
 BrowserViewsAccessibilityTest::BrowserViewsAccessibilityTest() {
   ui::win::CreateATLModuleIfNeeded();
-  ::CoInitialize(NULL);
 }
 
 BrowserViewsAccessibilityTest::~BrowserViewsAccessibilityTest() {
-  ::CoUninitialize();
 }
 
 BrowserWindowTesting* BrowserViewsAccessibilityTest::GetBrowserWindowTesting() {
   BrowserWindow* browser_window = browser()->window();
   return browser_window ? browser_window->GetBrowserWindowTesting() : NULL;
 }
 
 BrowserView* BrowserViewsAccessibilityTest::GetBrowserView() {
   return BrowserView::GetBrowserViewForBrowser(browser());
 }
@@ skipping 177 matching lines @@
 }
 
 // http://crbug.com/104132
 IN_PROC_BROWSER_TEST_F(BrowserViewsAccessibilityTest,
                        DISABLED_TestBookmarkBarViewAccObj) {
   TestViewAccessibilityObject(
       GetBookmarkBarView(),
       UTF16ToWide(l10n_util::GetStringUTF16(IDS_ACCNAME_BOOKMARKS)),
       ROLE_SYSTEM_TOOLBAR);
 }