Unify frame IDs with RenderFrameHost routing IDs.

content/browser/frame_host/frame_tree_node.cc

Index: content/browser/frame_host/frame_tree_node.cc
diff --git a/content/browser/frame_host/frame_tree_node.cc b/content/browser/frame_host/frame_tree_node.cc
index db90529d248664b8ab0cb041402a1c3a6369117a..c86cde47495e37f3228db12dd7b60b2f8da11ac8 100644
--- a/content/browser/frame_host/frame_tree_node.cc
+++ b/content/browser/frame_host/frame_tree_node.cc
@@ -14,7 +14,6 @@
 
 namespace content {
 
-const int64 FrameTreeNode::kInvalidFrameId = -1;
 int64 FrameTreeNode::next_frame_tree_node_id_ = 1;
 
 FrameTreeNode::FrameTreeNode(FrameTree* frame_tree,
@@ -23,7 +22,6 @@ FrameTreeNode::FrameTreeNode(FrameTree* frame_tree,
                              RenderViewHostDelegate* render_view_delegate,
                              RenderWidgetHostDelegate* render_widget_delegate,
                              RenderFrameHostManager::Delegate* manager_delegate,
-                             int64 frame_id,
                              const std::string& name)
     : frame_tree_(frame_tree),
       navigator_(navigator),
@@ -33,7 +31,6 @@ FrameTreeNode::FrameTreeNode(FrameTree* frame_tree,
                       render_widget_delegate,
                       manager_delegate),
       frame_tree_node_id_(next_frame_tree_node_id_++),
-      frame_id_(frame_id),
       frame_name_(name),
       parent_(NULL) {}
 
@@ -73,7 +70,6 @@ void FrameTreeNode::RemoveChild(FrameTreeNode* child) {
 }
 
 void FrameTreeNode::ResetForNewProcess() {
-  frame_id_ = kInvalidFrameId;
   current_url_ = GURL();
 
   // The children may not have been cleared if a cross-process navigation