Update resource requests to remove redundant frame ID.

content/public/browser/resource_request_info.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_PUBLIC_BROWSER_RESOURCE_REQUEST_INFO_H_
 #define CONTENT_PUBLIC_BROWSER_RESOURCE_REQUEST_INFO_H_
 
 #include "base/basictypes.h"
 #include "content/common/content_export.h"
 #include "content/public/common/page_transition_types.h"
@@ skipping 53 matching lines @@
 
   // Unique identifier (within the scope of the child process) for this request.
   virtual int GetRequestID() const = 0;
 
   // The IPC route identifier of the RenderFrame.
   // TODO(jam): once all navigation and resource requests are sent between
   // frames and RenderView/RenderViewHost aren't involved we can remove this and
   // just use GetRouteID above.
   virtual int GetRenderFrameID() const = 0;
 
   // True if GetFrameID() represents a main frame in the RenderView.

[battre, 2014/03/03 11:35:28]

This comment needs to be updated.

[Charlie Reis, 2014/03/03 17:14:44]

Good catch.  Fixing now.

[Charlie Reis, 2014/03/03 17:21:25]

Done.

   virtual bool IsMainFrame() const = 0;
 
-  // Frame ID that sent this resource request. -1 if unknown / invalid.
-  virtual int64 GetFrameID() const = 0;
-
   // True if GetParentFrameID() represents a main frame in the RenderView.
   virtual bool ParentIsMainFrame() const = 0;

[battre, 2014/03/03 11:35:28]

This comment and function need to be updated.

[Charlie Reis, 2014/03/03 17:14:44]

I'll update the comment to say GetParentRenderFrameID(), but
"ParentIsMainFrame()" is still an accurate function name-- it still returns
whether the parent frame is the main frame.

[Charlie Reis, 2014/03/03 17:21:25]

Done.

 
-  // Frame ID of parent frame of frame that sent this resource request.
+  // Routing ID of parent frame of frame that sent this resource request.
   // -1 if unknown / invalid.
-  virtual int64 GetParentFrameID() const = 0;
+  virtual int GetParentRenderFrameID() const = 0;
 
   // Returns the associated resource type.
   virtual ResourceType::Type GetResourceType() const = 0;
 
   // Returns the process type that initiated this request.
   virtual int GetProcessType() const = 0;
 
   // Returns the associated referrer policy.
   virtual blink::WebReferrerPolicy GetReferrerPolicy() const = 0;
 
@@ skipping 22 matching lines @@
   // Whether this is a download.
   virtual bool IsDownload() const = 0;
 
  protected:
   virtual ~ResourceRequestInfo() {}
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_RESOURCE_REQUEST_INFO_H_