Ensure that accessibility information from native views like the autocomplete...

views/accessibility/view_accessibility.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.h"
 
 #include "views/accessibility/view_accessibility_wrapper.h"
 #include "views/widget/widget.h"
 
 const wchar_t kViewsUninitializeAccessibilityInstance[] =
@@ skipping 756 matching lines @@
   // Deprecated.
   return E_NOTIMPL;
 }
 
 HRESULT ViewAccessibility::GetNativeIAccessibleInterface(
     views::NativeViewHost* native_host, IDispatch** disp_child) {
   if (!native_host || !disp_child) {
     return E_INVALIDARG;
   }
 
-  HWND render_view_window =
+  HWND native_view_window =
       static_cast<HWND>(GetProp(native_host->native_view(),
                                 kViewsNativeHostPropForAccessibility));
+  if (!IsWindow(native_view_window)) {
+    native_view_window = native_host->native_view();
+  }
 
-  if (IsWindow(render_view_window)) {
-    LRESULT ret = SendMessage(render_view_window, WM_GETOBJECT, 0,
+  if (IsWindow(native_view_window)) {
+    LRESULT ret = SendMessage(native_view_window, WM_GETOBJECT, 0,
                               OBJID_CLIENT);
     return ObjectFromLresult(ret, IID_IDispatch, 0,
                              reinterpret_cast<void**>(disp_child));
   }
 
   return E_FAIL;
 }