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

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 108608)
+++ chrome/browser/accessibility/browser_accessibility_win_unittest.cc (working copy)
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "base/memory/scoped_ptr.h"
+#include "base/win/atl_module.h"
#include "base/win/scoped_comptr.h"
#include "content/browser/accessibility/browser_accessibility_manager.h"
#include "content/browser/accessibility/browser_accessibility_win.h"
@@ -52,12 +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.
- ::CoInitialize(NULL);
+ base::win::CreateATLModuleIfNeeded();
}
virtual void TearDown() {

Powered by Google App Engine
This is Rietveld 408576698