Make RenderFrameHostImpl::GetRenderWidgetHost() always return an object

content/browser/accessibility/dump_accessibility_browsertest_base.cc

 // Copyright 2014 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/dump_accessibility_browsertest_base.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 251 matching lines @@
     // but B's url in the browser frame tree is still "about:blank".
     std::string url = node->current_url().spec();
     if (url != url::kAboutBlankURL)
       all_frame_urls.push_back(url);
 
     // We won't get the correct coordinate transformations for
     // out-of-process iframes until each frame's surface is ready.
     RenderFrameHostImpl* current_frame_host = node->current_frame_host();
     if (!current_frame_host)
       continue;
-    RenderWidgetHostImpl* rwh = current_frame_host->GetRenderWidgetHost();
-    if (!rwh)
-      continue;
-    RenderWidgetHostViewBase* rwhv = rwh->GetView();
+    RenderWidgetHostViewBase* rwhv =
+        static_cast<RenderWidgetHostViewBase*>(current_frame_host->GetView());

[Charlie Reis, 2016/05/27 22:50:28]

Sanity check: Before, this code skipped frames that weren't local frame roots,
since those had null widgets.  That seemed to work out well, since we would only
do the surface check below once per RWHV.  Now we'll do it once per frame, which
might be several times per RWHV.

That doesn't seem like a big problem to me (since the subsequent waits should
return right away), but maybe it's worth a comment in case someone later wants
to simplify this to iterate over the RWHVs instead of the frames.

[kenrb, 2016/05/30 19:39:53]

Good point, fixed it to match the old behavior.

     if (rwhv && rwhv->IsChildFrameForTesting()) {
       SurfaceHitTestReadyNotifier notifier(
           static_cast<RenderWidgetHostViewChildFrame*>(rwhv));
       notifier.WaitForSurfaceReady();
     }
   }
 
   // Wait for the accessibility tree to fully load for all frames,
   // by searching for the WEB_AREA node in the accessibility tree
   // with the url of each frame in our frame tree. Note that this
@@ skipping 100 matching lines @@
           expected_file, actual_contents.c_str(), actual_contents.size()));
       LOG(INFO) << "Wrote expectations to: "
                 << expected_file.LossyDisplayName();
     }
   } else {
     LOG(INFO) << "Test output matches expectations.";
   }
 }
 
 }  // namespace content