Fix a few lingering bugs in BrowserAccessibilityManager and BrowserAccessibilityCocoa.

chrome/browser/renderer_host/render_widget_host_view_win.cc

Index: chrome/browser/renderer_host/render_widget_host_view_win.cc
diff --git a/chrome/browser/renderer_host/render_widget_host_view_win.cc b/chrome/browser/renderer_host/render_widget_host_view_win.cc
index 74e1277dc403f8127a877225b50584c5d16cf7b8..27b1972c15b314f376765ab0013fbb75ed304c9f 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_win.cc
+++ b/chrome/browser/renderer_host/render_widget_host_view_win.cc
@@ -1428,14 +1428,10 @@ LRESULT RenderWidgetHostViewWin::OnMouseActivate(UINT message,
 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);
 }
 
@@ -1611,11 +1607,11 @@ IAccessible* RenderWidgetHostViewWin::GetIAccessible() {
 
   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);
+    WebAccessibility::State busy_state =
+        static_cast<WebAccessibility::State>(1 << WebAccessibility::STATE_BUSY);
     browser_accessibility_manager_.reset(
-      BrowserAccessibilityManager::Create(m_hWnd, loading_tree, this));
+        BrowserAccessibilityManager::CreateEmptyDocument(
+            m_hWnd, busy_state, this));
   }
 
   return browser_accessibility_manager_->GetRoot()->toBrowserAccessibilityWin();