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

content/browser/download/save_package.cc

Index: content/browser/download/save_package.cc
diff --git a/content/browser/download/save_package.cc b/content/browser/download/save_package.cc
index 6850b91f6535abffc286d2938e690eeb51e3b4ca..2af089f268a7cce98010f42ee2c3ad4d1295a967 100644
--- a/content/browser/download/save_package.cc
+++ b/content/browser/download/save_package.cc
@@ -1199,13 +1199,11 @@ void SavePackage::OnSavableResourceLinksResponse(
     RenderFrameHostImpl* sender,
     const std::vector<GURL>& resources_list,
     const std::vector<Referrer>& referrers_list,
-    const std::vector<GURL>& subframe_original_urls,
-    const std::vector<int>& subframe_routing_ids) {
+    const std::vector<SavableSubframe>& subframes) {
   if (wait_state_ != RESOURCES_LIST)
     return;
 
-  if ((resources_list.size() != referrers_list.size()) ||
-      (subframe_original_urls.size() != subframe_routing_ids.size())) {
+  if (resources_list.size() != referrers_list.size()) {
     // Only reachable if the renderer has a bug or has been compromised.
     NOTREACHED();
     return;
@@ -1217,10 +1215,10 @@ void SavePackage::OnSavableResourceLinksResponse(
     EnqueueSavableResource(container_frame_tree_node_id, resources_list[i],
                            referrers_list[i]);
   }
-  for (size_t i = 0; i < subframe_routing_ids.size(); ++i) {
+  for (const SavableSubframe& subframe : subframes) {
     FrameTreeNode* subframe_tree_node =
         sender->frame_tree_node()->frame_tree()->FindByRoutingID(
-            sender->GetProcess()->GetID(), subframe_routing_ids[i]);
+            sender->GetProcess()->GetID(), subframe.routing_id);
 
     if (!subframe_tree_node ||
         subframe_tree_node->parent() != sender->frame_tree_node()) {
@@ -1231,7 +1229,7 @@ void SavePackage::OnSavableResourceLinksResponse(
 
     EnqueueFrame(container_frame_tree_node_id,
                  subframe_tree_node->frame_tree_node_id(),
-                 subframe_original_urls[i]);
+                 subframe.original_url);
   }
 
   CompleteSavableResourceLinksResponse();