Use RenderFrameHost for ::RequestPermission() and ::CancelPermission().

components/content_settings/core/common/permission_request_id.h

Index: components/content_settings/core/common/permission_request_id.h
diff --git a/components/content_settings/core/common/permission_request_id.h b/components/content_settings/core/common/permission_request_id.h
index a9252a15c72d81ff7ae3d3864262b22ddc6e1018..6b798d496fcf628f2fe1dc49b975cb9eccd02e38 100644
--- a/components/content_settings/core/common/permission_request_id.h
+++ b/components/content_settings/core/common/permission_request_id.h
@@ -13,23 +13,22 @@
 class PermissionRequestID {
  public:
   PermissionRequestID(int render_process_id,
-                      int render_view_id,
+                      int render_frame_id,
                       int bridge_id,
                       const GURL& origin);
   ~PermissionRequestID();
 
   int render_process_id() const { return render_process_id_; }
-  int render_view_id() const { return render_view_id_; }
+  int render_frame_id() const { return render_frame_id_; }
   int bridge_id() const { return bridge_id_; }
   GURL origin() const { return origin_; }
 
   bool Equals(const PermissionRequestID& other) const;
-  bool IsForSameTabAs(const PermissionRequestID& other) const;
   std::string ToString() const;
 
  private:
   int render_process_id_;
-  int render_view_id_;
+  int render_frame_id_;
   // Id unique to this instance.
   int bridge_id_;
   // Needed for permission checks that are based on origin.