Fix double-initialization of CComModule.

chrome/browser/accessibility/renderer_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 <string>
 #include <vector>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_widget_host.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 
 #if defined(OS_WIN)
 #include <atlbase.h>
 #include <atlcom.h>
+#include "base/win/atl_module.h"
 #endif
 
 using webkit_glue::WebAccessibility;
 
 namespace {
 
 class RendererAccessibilityBrowserTest : public InProcessBrowserTest {
  public:
   RendererAccessibilityBrowserTest() {}
 
@@ skipping 30 matching lines @@
   std::string GetAttr(const WebAccessibility& node,
                       const WebAccessibility::StringAttribute attr);
   int GetIntAttr(const WebAccessibility& node,
                  const WebAccessibility::IntAttribute attr);
   bool GetBoolAttr(const WebAccessibility& node,
                    const WebAccessibility::BoolAttribute attr);
 };
 
 void RendererAccessibilityBrowserTest::SetUpInProcessBrowserTestFixture() {
 #if defined(OS_WIN)
-  // ATL might need a pointer to a COM module, depending on the build config.
-  if (!_pAtlModule) {
-    static CComModule module;
-    _pAtlModule = &module;
-  }
-
-  // Make sure COM is initialized for this thread; it's safe to call twice.
+  base::win::CreateATLModuleIfNeeded();
   ::CoInitialize(NULL);
 #endif
 }
 
 void RendererAccessibilityBrowserTest::TearDownInProcessBrowserTestFixture() {
 #if defined(OS_WIN)
   ::CoUninitialize();
 #endif
 }
 
@@ skipping 359 matching lines @@
   const WebAccessibility& tree = GetWebAccessibilityTree();
 
   ASSERT_EQ(1U, tree.children.size());
   const WebAccessibility& textbox = tree.children[0];
 
   EXPECT_EQ(
       true, GetBoolAttr(textbox, WebAccessibility::ATTR_CAN_SET_VALUE));
 }
 
 }  // namespace