Fix a few lingering bugs in BrowserAccessibilityManager and BrowserAccessibilityCocoa.

chrome/browser/renderer_host/render_widget_host_view_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 "chrome/browser/renderer_host/render_widget_host_view_win.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/i18n/rtl.h"
@@ skipping 1410 matching lines @@
     }
   }
   handled = FALSE;
   render_widget_host_->OnMouseActivate();
   return MA_ACTIVATE;
 }
 
 void RenderWidgetHostViewWin::OnAccessibilityNotifications(
     const std::vector<ViewHostMsg_AccessibilityNotification_Params>& params) {
   if (!browser_accessibility_manager_.get()) {
-    // Use empty document to process notifications
-    webkit_glue::WebAccessibility empty_document;
-    empty_document.role = WebAccessibility::ROLE_DOCUMENT;
-    empty_document.state = 0;
-    browser_accessibility_manager_.reset(
-        BrowserAccessibilityManager::Create(m_hWnd, empty_document, this));
+    BrowserAccessibilityManager::CreateEmptyDocument(
+        m_hWnd, static_cast<WebAccessibility::State>(0), this);
   }
-
   browser_accessibility_manager_->OnAccessibilityNotifications(params);
 }
 
 void RenderWidgetHostViewWin::Observe(int type,
                                       const NotificationSource& source,
                                       const NotificationDetails& details) {
   DCHECK(type == content::NOTIFICATION_RENDERER_PROCESS_TERMINATED);
 
   // Get the RenderProcessHost that posted this notification, and exit
   // if it's not the one associated with this host view.
@@ skipping 155 matching lines @@
 }
 
 IAccessible* RenderWidgetHostViewWin::GetIAccessible() {
   if (render_widget_host_ && !render_widget_host_->renderer_accessible()) {
     // Attempt to detect screen readers by sending an event with our custom id.
     NotifyWinEvent(EVENT_SYSTEM_ALERT, m_hWnd, kIdCustom, CHILDID_SELF);
   }
 
   if (!browser_accessibility_manager_.get()) {
     // Return busy document tree while renderer accessibility tree loads.
-    webkit_glue::WebAccessibility loading_tree;
-    loading_tree.role = WebAccessibility::ROLE_DOCUMENT;
-    loading_tree.state = (1 << WebAccessibility::STATE_BUSY);
-    browser_accessibility_manager_.reset(
-      BrowserAccessibilityManager::Create(m_hWnd, loading_tree, this));
+    BrowserAccessibilityManager::CreateEmptyDocument(
+        m_hWnd, (1 << WebAccessibility::STATE_BUSY), this);
   }
 
   return browser_accessibility_manager_->GetRoot()->toBrowserAccessibilityWin();
 }
 
 LRESULT RenderWidgetHostViewWin::OnGetObject(UINT message, WPARAM wparam,
                                              LPARAM lparam, BOOL& handled) {
   if (kIdCustom == lparam) {
     // An MSAA client requestes our custom id. Assume that we have detected an
     // active windows screen reader.
@@ skipping 161 matching lines @@
     RenderWidgetHostView::GetRenderWidgetHostViewFromNativeView(
         gfx::NativeView native_view) {
   if (views::Widget::IsPureViews()) {
     // TODO(beng): Figure out what to do for Windows/v.o.v.
     return NULL;
   }
   return ::IsWindow(native_view) ?
       reinterpret_cast<RenderWidgetHostView*>(
           ViewProp::GetValue(native_view, kRenderWidgetHostViewKey)) : NULL;
 }