Use GetRoutingIdForFrameOrProxy helper in BlinkAXTreeSource.

content/renderer/accessibility/blink_ax_tree_source.cc

Index: content/renderer/accessibility/blink_ax_tree_source.cc
diff --git a/content/renderer/accessibility/blink_ax_tree_source.cc b/content/renderer/accessibility/blink_ax_tree_source.cc
index b4094e0ded3c604bcc591f5515576fec3c302cec..f9069459eab5d0f4e66572ee7f9a5518af9c699a 100644
--- a/content/renderer/accessibility/blink_ax_tree_source.cc
+++ b/content/renderer/accessibility/blink_ax_tree_source.cc
@@ -18,6 +18,7 @@
 #include "content/renderer/render_frame_impl.h"
 #include "content/renderer/render_frame_proxy.h"
 #include "content/renderer/render_view_impl.h"
+#include "content/renderer/web_frame_utils.h"
 #include "third_party/WebKit/public/platform/WebRect.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
 #include "third_party/WebKit/public/platform/WebString.h"
@@ -170,14 +171,9 @@ AXContentTreeData BlinkAXTreeSource::GetTreeData() const {
 
     // Get the tree ID for the parent frame.
     blink::WebFrame* parent_web_frame = web_frame->parent();
-    if (parent_web_frame && parent_web_frame->isWebRemoteFrame()) {
-      RenderFrameProxy* parent_render_frame_proxy =
-          RenderFrameProxy::FromWebFrame(parent_web_frame);
-      tree_data.parent_routing_id = parent_render_frame_proxy->routing_id();
-    } else if (parent_web_frame && parent_web_frame->isWebLocalFrame()) {
-      RenderFrame* parent_render_frame = RenderFrame::FromWebFrame(
-          parent_web_frame);
-      tree_data.parent_routing_id = parent_render_frame->GetRoutingID();
+    if (parent_web_frame) {
+      tree_data.parent_routing_id =
+          GetRoutingIdForFrameOrProxy(parent_web_frame);
     }
   }
 
@@ -471,19 +467,10 @@ void BlinkAXTreeSource::SerializeNode(blink::WebAXObject src,
     // Iframe.
     if (is_iframe) {
       WebFrame* frame = WebFrame::fromFrameOwnerElement(element);
-      if (frame && frame->isWebRemoteFrame()) {
-        RenderFrameProxy* render_frame_proxy =
-            RenderFrameProxy::FromWebFrame(frame);
-        DCHECK(render_frame_proxy);
+      if (frame) {
         dst->AddContentIntAttribute(
             AX_CONTENT_ATTR_CHILD_ROUTING_ID,
-            render_frame_proxy->routing_id());
-      } else if (frame && frame->isWebLocalFrame()) {
-        RenderFrame* render_frame = RenderFrame::FromWebFrame(frame);
-        DCHECK(render_frame);
-        dst->AddContentIntAttribute(
-            AX_CONTENT_ATTR_CHILD_ROUTING_ID,
-            render_frame->GetRoutingID());
+            GetRoutingIdForFrameOrProxy(frame));
       }
     }
   }