Update resource requests to remove redundant frame ID.

content/browser/loader/resource_request_info_impl.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.
 
 #ifndef CONTENT_BROWSER_LOADER_RESOURCE_REQUEST_INFO_IMPL_H_
 #define CONTENT_BROWSER_LOADER_RESOURCE_REQUEST_INFO_IMPL_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 29 matching lines @@
       const net::URLRequest* request);
 
   CONTENT_EXPORT 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);
   virtual ~ResourceRequestInfoImpl();
 
   // ResourceRequestInfo implementation:
   virtual ResourceContext* GetContext() const OVERRIDE;
   virtual int GetChildID() const OVERRIDE;
   virtual int GetRouteID() const OVERRIDE;
   virtual int GetOriginPID() const OVERRIDE;
   virtual int GetRequestID() const OVERRIDE;
   virtual int GetRenderFrameID() const OVERRIDE;
   virtual bool IsMainFrame() const OVERRIDE;
-  virtual int64 GetFrameID() const OVERRIDE;
   virtual bool ParentIsMainFrame() const OVERRIDE;
-  virtual int64 GetParentFrameID() const OVERRIDE;
+  virtual int GetParentRenderFrameID() const OVERRIDE;
   virtual ResourceType::Type GetResourceType() const OVERRIDE;
   virtual int GetProcessType() const OVERRIDE;
   virtual blink::WebReferrerPolicy GetReferrerPolicy() const OVERRIDE;
   virtual blink::WebPageVisibilityState GetVisibilityState() const OVERRIDE;
   virtual PageTransition GetPageTransition() const OVERRIDE;
   virtual bool HasUserGesture() const OVERRIDE;
   virtual bool WasIgnoredByHandler() const OVERRIDE;
   virtual bool GetAssociatedRenderFrame(int* render_process_id,
                                         int* render_frame_id) const OVERRIDE;
   virtual bool IsAsync() const OVERRIDE;
@@ skipping 11 matching lines @@
   }
 
   // Updates the data associated with this request after it is is transferred
   // to a new renderer process.  Not all data will change during a transfer.
   // We do not expect the ResourceContext to change during navigation, so that
   // does not need to be updated.
   void 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);
 
   // CrossSiteResourceHandler for this request.  May be null.
   CrossSiteResourceHandler* cross_site_handler() {
     return cross_site_handler_;
   }
   void set_cross_site_handler(CrossSiteResourceHandler* h) {
     cross_site_handler_ = h;
   }
 
@@ skipping 43 matching lines @@
   CrossSiteResourceHandler* cross_site_handler_;
   DetachableResourceHandler* detachable_handler_;
 
   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_;
   bool should_replace_current_entry_;
   bool is_download_;
   bool is_stream_;
   bool allow_download_;
   bool has_user_gesture_;
   bool was_ignored_by_handler_;
   ResourceType::Type resource_type_;
   PageTransition transition_type_;
   int memory_cost_;
   blink::WebReferrerPolicy referrer_policy_;
   blink::WebPageVisibilityState visibility_state_;
   ResourceContext* context_;
   // The filter might be deleted without deleting this object if the process
   // exits during a transfer.
   base::WeakPtr<ResourceMessageFilter> filter_;
   bool is_async_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourceRequestInfoImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_LOADER_RESOURCE_REQUEST_INFO_IMPL_H_