Fix double-initialization of CComModule.

chrome/browser/accessibility/browser_views_accessibility_browsertest.cc

 // Copyright (c) 2011 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_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"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/accessibility/accessibility_types.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/base/win/atl_module.h"
 #include "ui/views/accessibility/native_view_accessibility_win.h"
 #include "views/widget/widget.h"
 
 namespace {
 
 VARIANT id_self = {VT_I4, CHILDID_SELF};
 
-// Dummy class to force creation of ATL module, needed by COM to instantiate
-// NativeViewAccessibilityWin.
-class TestAtlModule : public CAtlDllModuleT<TestAtlModule> {};
-TestAtlModule test_atl_module_;
-
 }  // namespace
 
 class BrowserViewsAccessibilityTest : public InProcessBrowserTest {
  public:
   BrowserViewsAccessibilityTest() {
+    ui::win::CreateATLModuleIfNeeded();
     ::CoInitialize(NULL);
   }
 
   ~BrowserViewsAccessibilityTest() {
     ::CoUninitialize();
   }
 
   // Retrieves an instance of BrowserWindowTesting
   BrowserWindowTesting* GetBrowserWindowTesting() {
     BrowserWindow* browser_window = browser()->window();
@@ skipping 215 matching lines @@
   ASSERT_EQ(S_OK, hr);
   ASSERT_TRUE(NULL != acc_obj);
 
   TestAccessibilityInfo(
       acc_obj,
       UTF16ToWide(l10n_util::GetStringUTF16(IDS_ABOUT_CHROME_TITLE)),
       ROLE_SYSTEM_DIALOG);
 
   acc_obj->Release();
 }