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

Unified Diff: chrome/browser/accessibility/browser_accessibility_win_unittest.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/browser_accessibility_win_unittest.cc
===================================================================
--- chrome/browser/accessibility/browser_accessibility_win_unittest.cc (revision 109805)
+++ chrome/browser/accessibility/browser_accessibility_win_unittest.cc (working copy)
@@ -8,6 +8,7 @@
#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;
@@ -52,11 +53,7 @@
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);
}
« no previous file with comments | « no previous file | chrome/browser/accessibility/browser_views_accessibility_browsertest.cc » ('j') | ui/base/win/atl_module.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698