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

content/renderer/savable_resources_browsertest.cc

Index: content/renderer/savable_resources_browsertest.cc
diff --git a/content/renderer/savable_resources_browsertest.cc b/content/renderer/savable_resources_browsertest.cc
index 249cbd8284774519e41764ac38449fa0a0a52cea..dfccd8d581ef84818b85c58f65caefc28929245a 100644
--- a/content/renderer/savable_resources_browsertest.cc
+++ b/content/renderer/savable_resources_browsertest.cc
@@ -59,10 +59,8 @@ class SavableResourcesTest : public ContentBrowserTest {
                       int render_frame_routing_id) {
     // Get all savable resource links for the page.
     std::vector<GURL> resources_list;
-    std::vector<GURL> subframe_original_urls;
-    std::vector<blink::WebFrame*> subframes;
-    SavableResourcesResult result(&resources_list,
-                                  &subframe_original_urls, &subframes);
+    std::vector<SavableSubframe> subframes;
+    SavableResourcesResult result(&resources_list, &subframes);
 
     const char* savable_schemes[] = {
       "http",
@@ -80,9 +78,11 @@ class SavableResourcesTest : public ContentBrowserTest {
 
     EXPECT_THAT(resources_list, expected_resources_matcher);
 
-    EXPECT_EQ(subframe_original_urls.size(), subframes.size());
+    std::vector<GURL> subframe_original_urls;
+    for (const SavableSubframe& subframe : subframes) {
+      subframe_original_urls.push_back(subframe.original_url);
+    }
     EXPECT_THAT(subframe_original_urls, expected_subframe_urls_matcher);
-    EXPECT_THAT(subframes, testing::Each(testing::NotNull()));
   }
 };