Fix double-initialization of CComModule.

chrome/browser/accessibility/browser_accessibility_win_unittest.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 "base/memory/scoped_ptr.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/view_messages.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/base/win/atl_module.h"
 
 using webkit_glue::WebAccessibility;
 
 namespace {
 
 // Subclass of BrowserAccessibilityWin that counts the number of instances.
 class CountedBrowserAccessibility : public BrowserAccessibilityWin {
  public:
   CountedBrowserAccessibility() { global_obj_count_++; }
   virtual ~CountedBrowserAccessibility() { global_obj_count_--; }
@@ skipping 24 matching lines @@
 
   V_VT(&variant) = VT_I4;
   V_I4(&variant) = value;
 
   return variant;
 }
 
 class BrowserAccessibilityTest : public testing::Test {
  protected:
   virtual void SetUp() {
-    // ATL needs a pointer to a COM module.
-    static CComModule module;
-    _pAtlModule = &module;
-
-    // Make sure COM is initialized for this thread; it's safe to call twice.
+    ui::win::CreateATLModuleIfNeeded();
     ::CoInitialize(NULL);
   }
 
   virtual void TearDown() {
     ::CoUninitialize();
   }
 };
 
 // Test that BrowserAccessibilityManager correctly releases the tree of
 // BrowserAccessibility instances upon delete.
@@ skipping 291 matching lines @@
 
   ASSERT_EQ(S_OK, text1_obj->get_text(0, IA2_TEXT_OFFSET_LENGTH, &text));
   ASSERT_EQ(text, string16(L"One two three.\nFour five six."));
   SysFreeString(text);
 
   // Delete the manager and test that all BrowserAccessibility instances are
   // deleted.
   delete manager;
   ASSERT_EQ(0, CountedBrowserAccessibility::global_obj_count_);
 }