OOPIFs: Transitioning Get/Send...SavableResourceLinks away from RenderViewHost.

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"
-#include "content/public/renderer/render_view.h"
+#include "content/public/renderer/render_frame.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/renderer/savable_resources.h"
 #include "content/shell/browser/shell.h"
 #include "net/base/filename_util.h"
+#include "third_party/WebKit/public/web/WebLocalFrame.h"
 
 namespace content {
 
 class SavableResourcesTest : public ContentBrowserTest {
  public:
   void SetUpCommandLine(base::CommandLine* command_line) override {
     command_line->AppendSwitch(switches::kSingleProcess);
 #if defined(OS_WIN)
     // Don't want to try to create a GPU process.
     command_line->AppendSwitch(switches::kDisableGpu);
 #endif
   }
 
   // Test function GetAllSavableResourceLinksForCurrentPage with a web page.
   // We expect result of GetAllSavableResourceLinksForCurrentPage exactly
   // matches expected_resources_set.
   void GetSavableResourceLinksForPage(
       const base::FilePath& page_file_path,
       const std::set<GURL>& expected_resources_set) {
     // Convert local file path to file URL.
     GURL file_url = net::FilePathToFileURL(page_file_path);
     // Load the test file.
     NavigateToURL(shell(), file_url);
 
-    PostTaskToInProcessRendererAndWait(
-        base::Bind(&SavableResourcesTest::CheckResources,
-                   base::Unretained(this),
-                   page_file_path,
-                   expected_resources_set,
-                   file_url,
-                   shell()->web_contents()->GetRoutingID()));
+    PostTaskToInProcessRendererAndWait(base::Bind(
+        &SavableResourcesTest::CheckResources, base::Unretained(this),
+        page_file_path, expected_resources_set, file_url,
+        shell()->web_contents()->GetMainFrame()->GetRoutingID()));
   }
 
   void CheckResources(const base::FilePath& page_file_path,
                       const std::set<GURL>& expected_resources_set,
                       const GURL& file_url,
-                      int render_view_id) {
+                      int render_frame_routing_id) {
     // Get all savable resource links for the page.
     std::vector<GURL> resources_list;
     std::vector<GURL> referrer_urls_list;
     std::vector<blink::WebReferrerPolicy> referrer_policies_list;
-    std::vector<GURL> frames_list;
-    SavableResourcesResult result(&resources_list,
-                                  &referrer_urls_list,
-                                  &referrer_policies_list,
-                                  &frames_list);
+    SavableResourcesResult result(&resources_list, &referrer_urls_list,
+                                  &referrer_policies_list);
 
     const char* savable_schemes[] = {
       "http",
       "https",
       "file",
       NULL
     };
 
-    RenderView* render_view = RenderView::FromRoutingID(render_view_id);
+    RenderFrame* render_frame =
+        RenderFrame::FromRoutingID(render_frame_routing_id);
 
-    ASSERT_TRUE(GetAllSavableResourceLinksForCurrentPage(
-        render_view->GetWebView(), file_url, &result, savable_schemes));
+    ASSERT_TRUE(GetSavableResourceLinksForFrame(
+        render_frame->GetWebFrame(),
+        &result, savable_schemes));
 
     // Check all links of sub-resource
-    for (std::vector<GURL>::const_iterator cit = resources_list.begin();
-         cit != resources_list.end(); ++cit) {
-      ASSERT_TRUE(expected_resources_set.find(*cit) !=
-                  expected_resources_set.end());
-    }
-
-    // Check all links of frame.
-    for (std::vector<GURL>::const_iterator cit = frames_list.begin();
-         cit != frames_list.end(); ++cit) {
-      ASSERT_TRUE(expected_resources_set.find(*cit) !=
-                  expected_resources_set.end());
+    for (const auto& resource : resources_list) {
+      ASSERT_TRUE(expected_resources_set.count(resource) != 0);
     }
   }
 };
 
 IN_PROC_BROWSER_TEST_F(SavableResourcesTest,
                        GetSavableResourceLinksWithPageHasValidStyleLink) {
   const char* expected_sub_resource_links[] = {
     "style.css"
   };
 
@@ skipping 66 matching lines @@
     expected_resources_set.insert(
         net::FilePathToFileURL(expected_frame_url));
   }
 
   base::FilePath page_file_path =
       GetTestFilePath("dom_serializer", "youtube_2.htm");
   GetSavableResourceLinksForPage(page_file_path, expected_resources_set);
 }
 
 }  // namespace content