Revert r112885 and follow-up r112886.

content/browser/accessibility/browser_accessibility.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 "content/browser/accessibility/browser_accessibility.h"
 
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
@@ skipping 30 matching lines @@
 
 void BrowserAccessibility::DetachTree(
     std::vector<BrowserAccessibility*>* nodes) {
   nodes->push_back(this);
   for (size_t i = 0; i < children_.size(); i++)
     children_[i]->DetachTree(nodes);
   children_.clear();
   parent_ = NULL;
 }
 
-void BrowserAccessibility::PreInitialize(
+void BrowserAccessibility::Initialize(
     BrowserAccessibilityManager* manager,
     BrowserAccessibility* parent,
     int32 child_id,
     int32 index_in_parent,
     const webkit_glue::WebAccessibility& src) {
   manager_ = manager;
   parent_ = parent;
   child_id_ = child_id;
   index_in_parent_ = index_in_parent;
 
   // Update all of the rest of the attributes.
   name_ = src.name;
   value_ = src.value;
   role_ = src.role;
   state_ = src.state;
   renderer_id_ = src.id;
   string_attributes_ = src.string_attributes;
   int_attributes_ = src.int_attributes;
   float_attributes_ = src.float_attributes;
   bool_attributes_ = src.bool_attributes;
   html_attributes_ = src.html_attributes;
   location_ = src.location;
   indirect_child_ids_ = src.indirect_child_ids;
   line_breaks_ = src.line_breaks;
   cell_ids_ = src.cell_ids;
   unique_cell_ids_ = src.unique_cell_ids;
 
-  PreInitialize();
+  Initialize();
+}
+
+void BrowserAccessibility::Initialize() {
+  instance_active_ = true;
 }
 
 void BrowserAccessibility::AddChild(BrowserAccessibility* child) {
   children_.push_back(child);
 }
 
 void BrowserAccessibility::UpdateParent(BrowserAccessibility* parent,
                                         int index_in_parent) {
   parent_ = parent;
   index_in_parent_ = index_in_parent;
@@ skipping 168 matching lines @@
          ++iter) {
       (*iter)->InternalReleaseReference(true);
     }
   }
 
   ref_count_--;
   if (ref_count_ == 0) {
     // Allow the object to fire a TEXT_REMOVED notification.
     name_.clear();
     value_.clear();
-    PostInitialize();
+    SendNodeUpdateEvents();
 
     manager_->NotifyAccessibilityEvent(
         ViewHostMsg_AccEvent::OBJECT_HIDE, this);
 
     instance_active_ = false;
     children_.clear();
     manager_->Remove(child_id_, renderer_id_);
     NativeReleaseReference();
   }
 }
@@ skipping 72 matching lines @@
 string16 BrowserAccessibility::GetTextRecursive() const {
   if (!name_.empty()) {
     return name_;
   }
 
   string16 result;
   for (size_t i = 0; i < children_.size(); ++i)
     result += children_[i]->GetTextRecursive();
   return result;
 }
-
-void BrowserAccessibility::PreInitialize() {
-  instance_active_ = true;
-}