Fix double-initialization of CComModule.

views/accessibility/native_view_accessibility_win.cc

Index: views/accessibility/native_view_accessibility_win.cc
===================================================================
--- views/accessibility/native_view_accessibility_win.cc	(revision 108608)
+++ views/accessibility/native_view_accessibility_win.cc	(working copy)
@@ -7,6 +7,7 @@
 
 #include "views/accessibility/native_view_accessibility_win.h"
 
+#include "base/win/atl_module.h"
 #include "third_party/iaccessible2/ia2_api_all.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/view_prop.h"
@@ -21,6 +22,10 @@
 // static
 scoped_refptr<NativeViewAccessibilityWin> NativeViewAccessibilityWin::Create(
     views::View* view) {
+  // Make sure COM and ATL are initialized in this module.
+  base::win::CreateATLModuleIfNeeded();
+  ::CoInitialize(NULL);  // Safe to call more than once.

[rvargas (doing something else), 2011/11/04 22:52:15]

I'm missing the corresponding CoUninitialize

[dmazzoni, 2011/11/05 06:18:46]

Actually since content/ definitely calls CoInitialize and all of the
accessibility tests do, this shouldn't be needed. I just tested it and COM is
already initialized when this code is reached, even in a multi-dll build, so I
deleted it.

+
   CComObject<NativeViewAccessibilityWin>* instance = NULL;
   HRESULT hr = CComObject<NativeViewAccessibilityWin>::CreateInstance(
       &instance);