Unify frame IDs with RenderFrameHost routing IDs.

content/browser/frame_host/frame_tree_node.h

Index: content/browser/frame_host/frame_tree_node.h
diff --git a/content/browser/frame_host/frame_tree_node.h b/content/browser/frame_host/frame_tree_node.h
index 397343a2b5fa72aa72f0f63b91df99223f248d65..3b5e6acb6b34ac4cf0955d2e1dc8c1993a489eaf 100644
--- a/content/browser/frame_host/frame_tree_node.h
+++ b/content/browser/frame_host/frame_tree_node.h
@@ -28,7 +28,6 @@ class RenderFrameHostImpl;
 // are frame-specific (as opposed to page-specific).
 class CONTENT_EXPORT FrameTreeNode {
  public:
-  static const int64 kInvalidFrameId;
 
   FrameTreeNode(FrameTree* frame_tree,
                 Navigator* navigator,
@@ -36,7 +35,6 @@ class CONTENT_EXPORT FrameTreeNode {
                 RenderViewHostDelegate* render_view_delegate,
                 RenderWidgetHostDelegate* render_widget_delegate,
                 RenderFrameHostManager::Delegate* manager_delegate,
-                int64 frame_id,
                 const std::string& name);
 
   ~FrameTreeNode();
@@ -65,16 +63,6 @@ class CONTENT_EXPORT FrameTreeNode {
     return frame_tree_node_id_;
   }
 
-  // DO NOT USE.  Only used by FrameTree until we replace renderer-specific
-  // frame IDs with RenderFrameHost routing IDs.
-  void set_frame_id(int64 frame_id) {
-    DCHECK_EQ(frame_id_, kInvalidFrameId);
-    frame_id_ = frame_id;
-  }
-  int64 frame_id() const {
-    return frame_id_;
-  }
-
   const std::string& frame_name() const {
     return frame_name_;
   }
@@ -124,12 +112,6 @@ class CONTENT_EXPORT FrameTreeNode {
   // even if the frame does a cross-process navigation.
   const int64 frame_tree_node_id_;
 
-  // The renderer-specific identifier for the frame in the page.
-  // TODO(creis): Remove this in favor of the RenderFrameHost's routing ID once
-  // we create FrameTreeNodes for all frames (even without a flag), since this
-  // value can change after cross-process navigations.
-  int64 frame_id_;
-
   // The assigned name of the frame. This name can be empty, unlike the unique
   // name generated internally in the DOM tree.
   std::string frame_name_;