Move nav_entry_id from RenderViewHost to RenderFrameHost.

content/browser/renderer_host/render_view_host_impl.h

Index: content/browser/renderer_host/render_view_host_impl.h
diff --git a/content/browser/renderer_host/render_view_host_impl.h b/content/browser/renderer_host/render_view_host_impl.h
index ecdfc3cba62c6edcf20760b01b1b38634febfeab..3c1ea4b84c10c0e90d6bbde475fd5a938ff0bb20 100644
--- a/content/browser/renderer_host/render_view_host_impl.h
+++ b/content/browser/renderer_host/render_view_host_impl.h
@@ -326,11 +326,6 @@ class CONTENT_EXPORT RenderViewHostImpl : public RenderViewHost,
   // currently using it.
   int ref_count() { return frames_ref_count_; }
 
-  // TODO(avi): Move to RenderFrameHost once PageState is broken up into
-  // FrameStates.
-  int nav_entry_id() const { return nav_entry_id_; }
-  void set_nav_entry_id(int nav_entry_id) { nav_entry_id_ = nav_entry_id; }
-
   // NOTE: Do not add functions that just send an IPC message that are called in
   // one or two places. Have the caller send the IPC message directly (unless
   // the caller places are in different platforms, in which case it's better
@@ -439,11 +434,6 @@ class CONTENT_EXPORT RenderViewHostImpl : public RenderViewHost,
   // TODO(creis): Allocate this in WebContents/NavigationController instead.
   int32 page_id_;
 
-  // The unique ID of the latest NavigationEntry that this RenderViewHost is
-  // showing. TODO(avi): Move to RenderFrameHost once PageState is broken up
-  // into FrameStates.
-  int nav_entry_id_;
-
   // Tracks whether this RenderViewHost is in an active state.  False if the
   // main frame is pending swap out, pending deletion, or swapped out, because
   // it is not visible to the user in any of these cases.