Fixes and reenables RendererAccessibilityBrowserTest.*

content/browser/renderer_host/render_view_host.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/renderer_host/render_view_host.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 1379 matching lines @@
 
 void RenderViewHost::OnAccessibilityNotifications(
     const std::vector<ViewHostMsg_AccessibilityNotification_Params>& params) {
   if (view() && !is_swapped_out_)
     view()->OnAccessibilityNotifications(params);
 
   if (!params.empty()) {
     for (unsigned i = 0; i < params.size(); i++) {
       const ViewHostMsg_AccessibilityNotification_Params& param = params[i];
 
-      if (param.notification_type == ViewHostMsg_AccEvent::LOAD_COMPLETE &&
+      if ((param.notification_type == ViewHostMsg_AccEvent::LAYOUT_COMPLETE ||
+           param.notification_type == ViewHostMsg_AccEvent::LOAD_COMPLETE) &&
           save_accessibility_tree_for_testing_) {

[dmazzoni, 2011/12/10 06:27:36]

I just realized that there's no reason to go through the loop at all if
save_accessibility_tree_for_testing_ is false, so put this test up next to if
(!params.empty()).

[David Tseng, 2011/12/12 01:23:57]

I'd like to keep this as is to avoid any possible race conditions. Small changes
in this logic seems to lead to flakyness in the tests, are fairly hard to debug,
and require waiting for try runs to confirm for stability.

With that said, would it make sense to #ifdef this block for only debug builds?

         accessibility_tree_ = param.acc_tree;
-        content::NotificationService::current()->Notify(
-            content::NOTIFICATION_RENDER_VIEW_HOST_ACCESSIBILITY_TREE_UPDATED,
-            content::Source<RenderViewHost>(this),
-            content::NotificationService::NoDetails());
+
+        // Only notify for non-blank pages.
+        if (accessibility_tree_.children.size() > 0)
+          content::NotificationService::current()->Notify(
+              content::NOTIFICATION_RENDER_VIEW_HOST_ACCESSIBILITY_TREE_UPDATED,
+              content::Source<RenderViewHost>(this),
+              content::NotificationService::NoDetails());
       }
     }
   }
 
   Send(new ViewMsg_AccessibilityNotifications_ACK(routing_id()));
 }
 
 void RenderViewHost::OnScriptEvalResponse(int id, const ListValue& result) {
   Value* result_value;
   if (!result.Get(0, &result_value)) {
@@ skipping 103 matching lines @@
 
 void RenderViewHost::OnWebUISend(const GURL& source_url,
                                  const std::string& name,
                                  const base::ListValue& args) {
   delegate_->WebUISend(this, source_url, name, args);
 }
 
 void RenderViewHost::ClearPowerSaveBlockers() {
   STLDeleteValues(&power_save_blockers_);
 }