Revert r112885 and follow-up r112886.

content/browser/accessibility/browser_accessibility_manager.cc

Index: content/browser/accessibility/browser_accessibility_manager.cc
diff --git a/content/browser/accessibility/browser_accessibility_manager.cc b/content/browser/accessibility/browser_accessibility_manager.cc
index 266095a6e0a8ba7365c47dfdb41a76f44b884dc2..5e817498a2440ec2facf984f6ce72dd0a894eca0 100644
--- a/content/browser/accessibility/browser_accessibility_manager.cc
+++ b/content/browser/accessibility/browser_accessibility_manager.cc
@@ -256,13 +256,13 @@ void BrowserAccessibilityManager::UpdateNode(
   // modify |current| directly and return - no tree changes are needed.
   if (!include_children) {
     DCHECK_EQ(0U, src.children.size());
-    current->PreInitialize(
+    current->Initialize(
         this,
         current->parent(),
         current->child_id(),
         current->index_in_parent(),
         src);
-    current->PostInitialize();
+    current->SendNodeUpdateEvents();
     return;
   }
 
@@ -337,13 +337,7 @@ BrowserAccessibility* BrowserAccessibilityManager::CreateAccessibilityTree(
     children_can_send_show_events = false;
   }
 
-  instance->PreInitialize(this, parent, child_id, index_in_parent, src);
-  for (int i = 0; i < static_cast<int>(src.children.size()); ++i) {
-    BrowserAccessibility* child = CreateAccessibilityTree(
-        instance, src.children[i], i, children_can_send_show_events);
-    instance->AddChild(child);
-  }
-
+  instance->Initialize(this, parent, child_id, index_in_parent, src);
   child_id_map_[child_id] = instance;
   renderer_id_to_child_id_map_[src.id] = child_id;
 
@@ -352,6 +346,11 @@ BrowserAccessibility* BrowserAccessibilityManager::CreateAccessibilityTree(
 
   if ((src.state >> WebAccessibility::STATE_FOCUSED) & 1)
     SetFocus(instance, false);
+  for (int i = 0; i < static_cast<int>(src.children.size()); ++i) {
+    BrowserAccessibility* child = CreateAccessibilityTree(
+        instance, src.children[i], i, children_can_send_show_events);
+    instance->AddChild(child);
+  }
 
   // Note: the purpose of send_show_events and children_can_send_show_events
   // is so that we send a single OBJECT_SHOW event for the root of a subtree
@@ -360,7 +359,7 @@ BrowserAccessibility* BrowserAccessibilityManager::CreateAccessibilityTree(
   if (send_show_events)
     NotifyAccessibilityEvent(ViewHostMsg_AccEvent::OBJECT_SHOW, instance);
 
-  instance->PostInitialize();
+  instance->SendNodeUpdateEvents();
 
   return instance;
 }