Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(582)

Unified Diff: chrome/browser/accessibility/renderer_accessibility_browsertest.cc

Issue 8467002: Fix double-initialization of CComModule. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/accessibility/renderer_accessibility_browsertest.cc
===================================================================
--- chrome/browser/accessibility/renderer_accessibility_browsertest.cc (revision 108608)
+++ chrome/browser/accessibility/renderer_accessibility_browsertest.cc (working copy)
@@ -21,6 +21,7 @@
#if defined(OS_WIN)
#include <atlbase.h>
#include <atlcom.h>
+#include "base/win/atl_module.h"
#endif
using webkit_glue::WebAccessibility;
@@ -71,13 +72,7 @@
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
}

Powered by Google App Engine
This is Rietveld 408576698