Vector-of-structs (instead of struct-of-vectors) in "savable resources" IPC.

content/renderer/savable_resources.cc

Index: content/renderer/savable_resources.cc
diff --git a/content/renderer/savable_resources.cc b/content/renderer/savable_resources.cc
index 201938d1124e55cfaea362be4df4a7a0956c90cb..f150dcbf480563d1c966feadd3c5ae8581d48b02 100644
--- a/content/renderer/savable_resources.cc
+++ b/content/renderer/savable_resources.cc
@@ -9,6 +9,7 @@
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
+#include "content/renderer/web_frame_utils.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"
@@ -43,10 +44,14 @@ void GetSavableResourceLinkForElement(
     const WebDocument& current_doc,
     SavableResourcesResult* result) {
   if (element.hasHTMLTagName("iframe") || element.hasHTMLTagName("frame")) {
-    GURL original_url = current_doc.completeURL(element.getAttribute("src"));
-    WebFrame* subframe = WebFrame::fromFrameOwnerElement(element);
+    GURL complete_url = current_doc.completeURL(element.getAttribute("src"));
+    WebFrame* web_frame = WebFrame::fromFrameOwnerElement(element);
+
+    SavableSubframe subframe;
+    subframe.original_url = complete_url;
+    subframe.routing_id = GetRoutingIdForFrameOrProxy(web_frame);
+
     result->subframes->push_back(subframe);
-    result->subframe_original_urls->push_back(original_url);
     return;
   }