Content API changes to improve DOM stitching in ThreatDetails code.

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 c92c61a38b87e87abee6dfdd28add98d367af925..589c14a0d675ce3366c1f3cd1ad33cd3f22a6ac1 100644
--- a/content/renderer/accessibility/blink_ax_tree_source.cc
+++ b/content/renderer/accessibility/blink_ax_tree_source.cc
@@ -20,7 +20,6 @@
 #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/WebFloatRect.h"
 #include "third_party/WebKit/public/platform/WebRect.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
@@ -289,7 +288,7 @@ bool BlinkAXTreeSource::GetTreeData(AXContentTreeData* tree_data) const {
     blink::WebFrame* parent_web_frame = web_frame->Parent();
     if (parent_web_frame) {
       tree_data->parent_routing_id =
-          GetRoutingIdForFrameOrProxy(parent_web_frame);
+          RenderFrame::GetRoutingIdForWebFrame(parent_web_frame);
     }
   }
 
@@ -834,9 +833,8 @@ void BlinkAXTreeSource::SerializeNode(blink::WebAXObject src,
     // Frames and iframes.
     WebFrame* frame = WebFrame::FromFrameOwnerElement(element);
     if (frame) {
-      dst->AddContentIntAttribute(
-          AX_CONTENT_ATTR_CHILD_ROUTING_ID,
-          GetRoutingIdForFrameOrProxy(frame));
+      dst->AddContentIntAttribute(AX_CONTENT_ATTR_CHILD_ROUTING_ID,
+                                  RenderFrame::GetRoutingIdForWebFrame(frame));
     }
   }