Accessibility information from the renderer was not being returned to tools l...

views/accessibility/view_accessibility_wrapper.cc

 // Copyright (c) 2006-2008 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 "views/accessibility/view_accessibility_wrapper.h"
 
+#include "base/scoped_variant_win.h"
+
 #include "views/accessibility/view_accessibility.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // ViewAccessibilityWrapper - constructors, destructors
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 ViewAccessibilityWrapper::ViewAccessibilityWrapper(views::View* view)
     : accessibility_info_(NULL),
@@ skipping 19 matching lines @@
 
       // All is well, assign the temp instance to the class smart pointer.
       accessibility_info_.Attach(accessibility_instance.Detach());
     }
     return S_OK;
   }
   // Interface not supported.
   return E_NOINTERFACE;
 }
 
+HRESULT ViewAccessibilityWrapper::Uninitialize() {
+  view_ = NULL;
+  if (accessibility_info_.get()) {
+    accessibility_info_->put_accValue(
+        ScopedVariant(kViewsUninitializeAccessibilityInstance), NULL);
+    ::CoDisconnectObject(accessibility_info_.get(), 0);
+    accessibility_info_ = NULL;
+  }
+
+  return S_OK;
+}
+
 STDMETHODIMP ViewAccessibilityWrapper::GetInstance(REFIID iid,
                                                    void** interface_ptr) {
   if (IID_IUnknown == iid || IID_IDispatch == iid || IID_IAccessible == iid) {
     // If there is no accessibility instance created, create a default now.
     // Otherwise reuse previous instance.
     if (!accessibility_info_) {
       HRESULT hr = CreateDefaultInstance(iid);
 
       if (hr != S_OK) {
         // Interface creation failed.
@@ skipping 14 matching lines @@
     return E_NOINTERFACE;
 
   accessibility_info_.Attach(interface_ptr);
 
   // Paranoia check, to make sure we do have a valid IAccessible pointer stored.
   if (!accessibility_info_)
     return E_FAIL;
 
   return S_OK;
 }