Update resource requests to remove redundant frame ID.

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/loader/global_routing_id.h"
 #include "content/browser/loader/resource_message_filter.h"
 #include "content/browser/worker_host/worker_service_impl.h"
 #include "content/common/net/url_request_user_data.h"
@@ skipping 22 matching lines @@
     bool is_async) {
   ResourceRequestInfoImpl* info =
       new ResourceRequestInfoImpl(
           PROCESS_TYPE_RENDERER,             // process_type
           render_process_id,                 // child_id
           render_view_id,                    // route_id
           0,                                 // origin_pid
           0,                                 // request_id
           render_frame_id,                   // render_frame_id
           resource_type == ResourceType::MAIN_FRAME,  // is_main_frame
-          0,                                 // frame_id
           false,                             // parent_is_main_frame
-          0,                                 // parent_frame_id
+          0,                                 // parent_render_frame_id
           resource_type,                     // resource_type
           PAGE_TRANSITION_LINK,              // transition_type
           false,                             // should_replace_current_entry
           false,                             // is_download
           false,                             // is_stream
           true,                              // allow_download
           false,                             // has_user_gesture
           blink::WebReferrerPolicyDefault,   // referrer_policy
           blink::WebPageVisibilityStateVisible,  // visibility_state
           context,                           // context
@@ skipping 32 matching lines @@
 }
 
 ResourceRequestInfoImpl::ResourceRequestInfoImpl(
     int process_type,
     int child_id,
     int route_id,
     int origin_pid,
     int request_id,
     int render_frame_id,
     bool is_main_frame,
-    int64 frame_id,
     bool parent_is_main_frame,
-    int64 parent_frame_id,
+    int parent_render_frame_id,
     ResourceType::Type resource_type,
     PageTransition transition_type,
     bool should_replace_current_entry,
     bool is_download,
     bool is_stream,
     bool allow_download,
     bool has_user_gesture,
     blink::WebReferrerPolicy referrer_policy,
     blink::WebPageVisibilityState visibility_state,
     ResourceContext* context,
     base::WeakPtr<ResourceMessageFilter> filter,
     bool is_async)
     : cross_site_handler_(NULL),
       detachable_handler_(NULL),
       process_type_(process_type),
       child_id_(child_id),
       route_id_(route_id),
       origin_pid_(origin_pid),
       request_id_(request_id),
       render_frame_id_(render_frame_id),
       is_main_frame_(is_main_frame),
-      frame_id_(frame_id),
       parent_is_main_frame_(parent_is_main_frame),
-      parent_frame_id_(parent_frame_id),
+      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),
       was_ignored_by_handler_(false),
       resource_type_(resource_type),
       transition_type_(transition_type),
       memory_cost_(0),
       referrer_policy_(referrer_policy),
@@ skipping 27 matching lines @@
 }
 
 int ResourceRequestInfoImpl::GetRenderFrameID() const {
   return render_frame_id_;
 }
 
 bool ResourceRequestInfoImpl::IsMainFrame() const {
   return is_main_frame_;
 }
 
-int64 ResourceRequestInfoImpl::GetFrameID() const {
-  return frame_id_;
-}
-
 bool ResourceRequestInfoImpl::ParentIsMainFrame() const {
   return parent_is_main_frame_;
 }
 
-int64 ResourceRequestInfoImpl::GetParentFrameID() const {
-  return parent_frame_id_;
+int ResourceRequestInfoImpl::GetParentRenderFrameID() const {
+  return parent_render_frame_id_;
 }
 
 ResourceType::Type ResourceRequestInfoImpl::GetResourceType() const {
   return resource_type_;
 }
 
 int ResourceRequestInfoImpl::GetProcessType() const {
   return process_type_;
 }
 
@@ skipping 67 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,
-    int64 frame_id,
-    int64 parent_frame_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;
-  frame_id_ = frame_id;
+  parent_render_frame_id_ = parent_render_frame_id;
   filter_ = filter;
 }
 
 }  // namespace content