Content API changes to improve DOM stitching in ThreatDetails code.

content/renderer/savable_resources.cc

 // Copyright (c) 2013 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/renderer/savable_resources.h"
 
 #include <set>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "content/public/common/url_utils.h"
-#include "content/renderer/web_frame_utils.h"
+#include "content/renderer/render_frame_impl.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebVector.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebElement.h"
 #include "third_party/WebKit/public/web/WebElementCollection.h"
 #include "third_party/WebKit/public/web/WebInputElement.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebNode.h"
 #include "third_party/WebKit/public/web/WebView.h"
 
@@ skipping 40 matching lines @@
     SavableResourcesResult* result) {
   // Get absolute URL.
   WebString link_attribute_value = GetSubResourceLinkFromElement(element);
   GURL element_url = current_doc.CompleteURL(link_attribute_value);
 
   // See whether to report this element as a subframe.
   WebFrame* web_frame = WebFrame::FromFrameOwnerElement(element);
   if (web_frame && DoesFrameContainHtmlDocument(*web_frame, element)) {
     SavableSubframe subframe;
     subframe.original_url = element_url;
-    subframe.routing_id = GetRoutingIdForFrameOrProxy(web_frame);
+    subframe.routing_id = RenderFrame::GetRoutingIdForWebFrame(web_frame);
     result->subframes->push_back(subframe);
     return;
   }
 
   // Check whether the node has sub resource URL or not.
   if (link_attribute_value.IsNull())
     return;
 
   // Ignore invalid URL.
   if (!element_url.is_valid())
@@ skipping 80 matching lines @@
   // otherwise return NULL.
   if (!value.IsNull() && !value.IsEmpty() &&
       !base::StartsWith(value.Utf8(),
                         "javascript:", base::CompareCase::INSENSITIVE_ASCII))
     return value;
 
   return WebString();
 }
 
 }  // namespace content