Fix double-initialization of CComModule.

views/accessibility/native_view_accessibility_win.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 <atlbase.h>
 #include <atlcom.h>
 
 #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"
 #include "views/widget/native_widget_win.h"
 #include "views/widget/widget.h"
 
 using ui::AccessibilityTypes;
 
 // static
 long NativeViewAccessibilityWin::next_unique_id_ = 1;
 
 // 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);
   DCHECK(SUCCEEDED(hr));
   instance->set_view(view);
   return scoped_refptr<NativeViewAccessibilityWin>(instance);
 }
 
 NativeViewAccessibilityWin::NativeViewAccessibilityWin()
     : view_(NULL),
@@ skipping 872 matching lines @@
 }
 
 string16 NativeViewAccessibilityWin::TextForIAccessibleText() {
   ui::AccessibleViewState state;
   view_->GetAccessibleState(&state);
   if (state.role == AccessibilityTypes::ROLE_TEXT)
     return state.value;
   else
     return state.name;
 }