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

content/renderer/savable_resources_browsertest.cc

 // Copyright (c) 2012 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 "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
@@ skipping 41 matching lines @@
         shell()->web_contents()->GetMainFrame()->GetRoutingID()));
   }
 
   void CheckResources(const base::FilePath& page_file_path,
                       const UrlVectorMatcher& expected_resources_matcher,
                       const UrlVectorMatcher& expected_subframe_urls_matcher,
                       const GURL& file_url,
                       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",
       "https",
       "file",
       NULL
     };
 
     RenderFrame* render_frame =
         RenderFrame::FromRoutingID(render_frame_routing_id);
 
     ASSERT_TRUE(GetSavableResourceLinksForFrame(
         render_frame->GetWebFrame(),
         &result, savable_schemes));
 
     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()));
   }
 };
 
 IN_PROC_BROWSER_TEST_F(SavableResourcesTest,
                        GetSavableResourceLinksWithPageHasValidStyleLink) {
   base::FilePath page_file_path =
       GetTestFilePath("dom_serializer", "simple_linked_stylesheet.html");
 
   auto expected_subresources_matcher = testing::UnorderedElementsAre(
       net::FilePathToFileURL(GetTestFilePath("dom_serializer", "style.css")));
@@ skipping 33 matching lines @@
 
   auto expected_subresources_matcher = testing::IsEmpty();
 
   auto expected_subframe_urls_matcher = testing::IsEmpty();
 
   GetSavableResourceLinksForPage(page_file_path, expected_subresources_matcher,
                                  expected_subframe_urls_matcher);
 }
 
 }  // namespace content