Use FrameTreeNode ID as frameId in extension APIs

content/browser/loader/resource_request_info_impl.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 "content/browser/loader/resource_request_info_impl.h"
 
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/browser/loader/global_routing_id.h"
 #include "content/browser/loader/resource_message_filter.h"
 #include "content/browser/web_contents/web_contents_impl.h"
@@ skipping 53 matching lines @@
       new ResourceRequestInfoImpl(
           PROCESS_TYPE_RENDERER,             // process_type
           render_process_id,                 // child_id
           render_view_id,                    // route_id
           -1,                                // frame_tree_node_id
           0,                                 // origin_pid
           0,                                 // request_id
           render_frame_id,                   // render_frame_id
           is_main_frame,                     // is_main_frame
           parent_is_main_frame,              // parent_is_main_frame
-          0,                                 // parent_render_frame_id
           resource_type,                     // resource_type
           ui::PAGE_TRANSITION_LINK,          // transition_type
           false,                             // should_replace_current_entry
           false,                             // is_download
           false,                             // is_stream
           allow_download,                    // allow_download
           false,                             // has_user_gesture
           false,                             // enable load timing
           request->has_upload(),             // enable upload progress
           false,                             // do_not_prompt_for_login
@@ skipping 40 matching lines @@
 ResourceRequestInfoImpl::ResourceRequestInfoImpl(
     int process_type,
     int child_id,
     int route_id,
     int frame_tree_node_id,
     int origin_pid,
     int request_id,
     int render_frame_id,
     bool is_main_frame,
     bool parent_is_main_frame,
-    int parent_render_frame_id,
     ResourceType resource_type,
     ui::PageTransition transition_type,
     bool should_replace_current_entry,
     bool is_download,
     bool is_stream,
     bool allow_download,
     bool has_user_gesture,
     bool enable_load_timing,
     bool enable_upload_progress,
     bool do_not_prompt_for_login,
     blink::WebReferrerPolicy referrer_policy,
     blink::WebPageVisibilityState visibility_state,
     ResourceContext* context,
     base::WeakPtr<ResourceMessageFilter> filter,
     bool report_raw_headers,
     bool is_async,
     bool is_using_lofi,
     const std::string& original_headers)
     : cross_site_handler_(NULL),
       detachable_handler_(NULL),
       process_type_(process_type),
       child_id_(child_id),
       route_id_(route_id),
       frame_tree_node_id_(frame_tree_node_id),
       origin_pid_(origin_pid),
       request_id_(request_id),
       render_frame_id_(render_frame_id),
       is_main_frame_(is_main_frame),
       parent_is_main_frame_(parent_is_main_frame),
-      parent_render_frame_id_(parent_render_frame_id),
       should_replace_current_entry_(should_replace_current_entry),
       is_download_(is_download),
       is_stream_(is_stream),
       allow_download_(allow_download),
       has_user_gesture_(has_user_gesture),
       enable_load_timing_(enable_load_timing),
       enable_upload_progress_(enable_upload_progress),
       do_not_prompt_for_login_(do_not_prompt_for_login),
       was_ignored_by_handler_(false),
       counted_as_in_flight_request_(false),
@@ skipping 57 matching lines @@
 }
 
 bool ResourceRequestInfoImpl::IsMainFrame() const {
   return is_main_frame_;
 }
 
 bool ResourceRequestInfoImpl::ParentIsMainFrame() const {
   return parent_is_main_frame_;
 }
 
-int ResourceRequestInfoImpl::GetParentRenderFrameID() const {
-  return parent_render_frame_id_;
-}
-
 ResourceType ResourceRequestInfoImpl::GetResourceType() const {
   return resource_type_;
 }
 
 int ResourceRequestInfoImpl::GetProcessType() const {
   return process_type_;
 }
 
 blink::WebReferrerPolicy ResourceRequestInfoImpl::GetReferrerPolicy() const {
   return referrer_policy_;
@@ skipping 66 matching lines @@
 
 GlobalRoutingID ResourceRequestInfoImpl::GetGlobalRoutingID() const {
   return GlobalRoutingID(child_id_, route_id_);
 }
 
 void ResourceRequestInfoImpl::UpdateForTransfer(
     int child_id,
     int route_id,
     int origin_pid,
     int request_id,
-    int parent_render_frame_id,
     base::WeakPtr<ResourceMessageFilter> filter) {
   child_id_ = child_id;
   route_id_ = route_id;
   origin_pid_ = origin_pid;
   request_id_ = request_id;
-  parent_render_frame_id_ = parent_render_frame_id;
   filter_ = filter;
 }
 
 }  // namespace content