Make UnsafeResource hold a WebContents getter instead of RenderFrame ids

chrome/browser/safe_browsing/ui_manager.h

 // 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.
 //
 // The Safe Browsing service is responsible for downloading anti-phishing and
 // anti-malware tables and checking urls against them.
 
 #ifndef CHROME_BROWSER_SAFE_BROWSING_UI_MANAGER_H_
 #define CHROME_BROWSER_SAFE_BROWSING_UI_MANAGER_H_
 
@@ skipping 12 matching lines @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/permission_type.h"
 #include "url/gurl.h"
 
 namespace base {
 class Thread;
 }  // namespace base
 
 namespace content {
 class NavigationEntry;
+class WebContents;
 }  // namespace content
 
 namespace net {
 class SSLInfo;
 }  // namespace net
 
 namespace safe_browsing {
 
 class SafeBrowsingService;
 
@@ skipping 24 matching lines @@
     // "valid".
     // I.e,
     //   For MainPageLoadBlocked resources, it must not be called if the load
     //   was aborted (going back or replaced with a different navigation),
     //   or resumed (proceeded through warning or matched whitelist).
     //   For non-MainPageLoadBlocked resources, it must not be called if any
     //   other navigation has committed (whether by going back or unrelated
     //   navigations), though a pending navigation is okay.
     content::NavigationEntry* GetNavigationEntryForResource() const;
 
+    // Helper to build a getter for WebContents* from render frame id.
+    static base::Callback<content::WebContents*(void)> GetWebContentsGetter(
+        int render_process_host_id,
+        int render_frame_id);
+
     GURL url;
     GURL original_url;
     std::vector<GURL> redirect_urls;
     bool is_subresource;
     bool is_subframe;
     SBThreatType threat_type;
     ThreatMetadata threat_metadata;
     UrlCheckCallback callback;  // This is called back on |callback_thread|.
     scoped_refptr<base::SingleThreadTaskRunner> callback_thread;
-    int render_process_host_id;
-    int render_frame_id;
+    base::Callback<content::WebContents*(void)> web_contents_getter;
     safe_browsing::ThreatSource threat_source;
   };
 
   // Observer class can be used to get notified when a SafeBrowsing hit
   // was found.
   class Observer {
    public:
     // The |resource| was classified as unsafe by SafeBrowsing, and is
     // not whitelisted.
     // The |resource| must not be accessed after OnSafeBrowsingHit returns.
@@ skipping 96 matching lines @@
   scoped_refptr<SafeBrowsingService> sb_service_;
 
   base::ObserverList<Observer> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(SafeBrowsingUIManager);
 };
 
 }  // namespace safe_browsing
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_UI_MANAGER_H_