Relanding 49339

It was unjustly reverted due to flaky unit-test failure.
Original review:

http://codereview.chromium.org/2358003

TBR=ctguil@chromium.org

Review URL: http://codereview.chromium.org/2720003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49344 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 3 insertions, 19 deletions

diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc
index 2fd0504..e2bbfe8 100644
--- a/chrome/browser/tab_contents/tab_contents.cc
+++ b/chrome/browser/tab_contents/tab_contents.cc
@@ -296,7 +296,6 @@ TabContents::TabContents(Profile* profile,
       opener_dom_ui_type_(DOMUIFactory::kNoDOMUI),
       language_state_(&controller_),
       geolocation_settings_state_(profile),
-      requested_accessibility_tree_(false),
       closed_by_user_gesture_(false) {
   ClearBlockedContentSettings();
   renderer_preferences_util::UpdateFromSystemSettings(
@@ -355,10 +354,6 @@ TabContents::TabContents(Profile* profile,
   // Set-up the showing of the omnibox search infobar if applicable.
   if (OmniboxSearchHint::IsEnabled(profile))
     omnibox_search_hint_.reset(new OmniboxSearchHint(this));
-
-  renderer_accessible_ =
-    CommandLine::ForCurrentProcess()->HasSwitch(
-        switches::kEnableRendererAccessibility);
 }
 
 TabContents::~TabContents() {
@@ -2147,10 +2142,8 @@ void TabContents::DidFailProvisionalLoadWithError(
 
 void TabContents::DocumentLoadedInFrame() {
   controller_.DocumentLoadedInFrame();
-  if (renderer_accessible_ && !requested_accessibility_tree_) {
-    render_view_host()->RequestAccessibilityTree();
-    requested_accessibility_tree_ = true;
-  }
+
+  render_view_host()->SetDocumentLoaded(true);
 }
 
 void TabContents::OnContentBlocked(ContentSettingsType type) {
@@ -2320,7 +2313,7 @@ void TabContents::DidNavigate(RenderViewHost* rvh,
                               const ViewHostMsg_FrameNavigate_Params& params) {
   int extra_invalidate_flags = 0;
 
-  requested_accessibility_tree_ = false;
+  render_view_host()->SetDocumentLoaded(false);
 
   if (PageTransition::IsMainFrame(params.transition)) {
     bool was_bookmark_bar_visible = ShouldShowBookmarkBar();
diff --git a/chrome/browser/tab_contents/tab_contents.h b/chrome/browser/tab_contents/tab_contents.h
index 42c409b..62dd896 100644
--- a/chrome/browser/tab_contents/tab_contents.h
+++ b/chrome/browser/tab_contents/tab_contents.h
@@ -1282,15 +1282,6 @@ class TabContents : public PageNavigator,
   // Manages information about Geolocation API usage in this page.
   GeolocationSettingsState geolocation_settings_state_;
 
-  // Whether the renderer is made accessible.
-  // TODO(dmazzoni): http://crbug.com/25564 This is a temporary work-around
-  // until that bug is fixed.
-  bool renderer_accessible_;
-
-  // Keep track of if we've already requested the accessibility tree so
-  // we don't do it more than once.
-  bool requested_accessibility_tree_;
-
   // See description above setter.
   bool closed_by_user_gesture_;