Require a process ID when looking up RFHs by FrameTreeNode ID.

content/browser/frame_host/navigation_handle_impl.cc

 // Copyright 2015 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.
 
 #include "content/browser/frame_host/navigation_handle_impl.h"
 
 #include <iterator>
 
 #include "base/logging.h"
 #include "content/browser/appcache/appcache_navigation_handle.h"
@@ skipping 212 matching lines @@
 }
 
 const std::vector<GURL>& NavigationHandleImpl::GetRedirectChain() {
   return redirect_chain_;
 }
 
 int NavigationHandleImpl::GetFrameTreeNodeId() {
   return frame_tree_node_->frame_tree_node_id();
 }
 
-int NavigationHandleImpl::GetParentFrameTreeNodeId() {
+RenderFrameHostImpl* NavigationHandleImpl::GetParentFrame() {
   if (frame_tree_node_->IsMainFrame())
-    return FrameTreeNode::kFrameTreeNodeInvalidId;
+    return nullptr;
 
-  return frame_tree_node_->parent()->frame_tree_node_id();
+  return frame_tree_node_->parent()->current_frame_host();
 }
 
 const base::TimeTicks& NavigationHandleImpl::NavigationStart() {
   return navigation_start_;
 }
 
 bool NavigationHandleImpl::IsPost() {
   CHECK_NE(INITIAL, state_)
       << "This accessor should not be called before the request is started.";
   return method_ == "POST";
@@ skipping 799 matching lines @@
     if (node->current_url().EqualsIgnoringRef(url_)) {
       if (found_self_reference)
         return true;
       found_self_reference = true;
     }
   }
   return false;
 }
 
 }  // namespace content