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

content/renderer/savable_resources.h

Index: content/renderer/savable_resources.h
diff --git a/content/renderer/savable_resources.h b/content/renderer/savable_resources.h
index 2878b2ae7aa6bfc76ee8a4ae1a9de04b6b465b18..af0ebd6084617772815bfdc34143d4b2e53020ba 100644
--- a/content/renderer/savable_resources.h
+++ b/content/renderer/savable_resources.h
@@ -9,6 +9,7 @@
 #include <vector>
 
 #include "content/common/content_export.h"
+#include "content/common/savable_subframe.h"
 #include "third_party/WebKit/public/platform/WebReferrerPolicy.h"
 #include "url/gurl.h"
 
@@ -36,23 +37,18 @@ struct SavableResourcesResult {
   // referrer_policies_list[i] corresponds to referrer_urls_list[i].
   std::vector<blink::WebReferrerPolicy>* referrer_policies_list;
 
-  // Original urls of subframes.
-  std::vector<GURL>* subframe_original_urls;
-  // Subframe objects.
-  // subframes[i] corresponds to subframe_original_urls[i].
-  std::vector<blink::WebFrame*>* subframes;
+  // Subframes.
+  std::vector<SavableSubframe>* subframes;
 
   // Constructor.
   SavableResourcesResult(
       std::vector<GURL>* resources_list,
       std::vector<GURL>* referrer_urls_list,
       std::vector<blink::WebReferrerPolicy>* referrer_policies_list,
-      std::vector<GURL>* subframe_original_urls,
-      std::vector<blink::WebFrame*>* subframes)
+      std::vector<SavableSubframe>* subframes)
       : resources_list(resources_list),
         referrer_urls_list(referrer_urls_list),
         referrer_policies_list(referrer_policies_list),
-        subframe_original_urls(subframe_original_urls),
         subframes(subframes) {}
 
  private: