Move browser-to-renderer opener plumbing to frame routing IDs

content/test/test_render_view_host.cc

Index: content/test/test_render_view_host.cc
diff --git a/content/test/test_render_view_host.cc b/content/test/test_render_view_host.cc
index a3603f5270a0a99594a79cfc910bee168a1fd9ff..520ac89106ce3bf66a1334c2bb4a711cb8deccdc 100644
--- a/content/test/test_render_view_host.cc
+++ b/content/test/test_render_view_host.cc
@@ -225,7 +225,7 @@ TestRenderViewHost::TestRenderViewHost(
                          false /* hidden */,
                          false /* has_initialized_audio_host */),
       delete_counter_(NULL),
-      opener_route_id_(MSG_ROUTING_NONE) {
+      opener_frame_route_id_(MSG_ROUTING_NONE) {
   // TestRenderWidgetHostView installs itself into this->view_ in its
   // constructor, and deletes itself when TestRenderWidgetHostView::Destroy() is
   // called.
@@ -239,18 +239,18 @@ TestRenderViewHost::~TestRenderViewHost() {
 
 bool TestRenderViewHost::CreateTestRenderView(
     const base::string16& frame_name,
-    int opener_route_id,
+    int opener_frame_route_id,
     int proxy_route_id,
     int32 max_page_id,
     bool window_was_created_with_opener) {
   FrameReplicationState replicated_state;
   replicated_state.name = base::UTF16ToUTF8(frame_name);
-  return CreateRenderView(opener_route_id, proxy_route_id, max_page_id,
+  return CreateRenderView(opener_frame_route_id, proxy_route_id, max_page_id,
                           replicated_state, window_was_created_with_opener);
 }
 
 bool TestRenderViewHost::CreateRenderView(
-    int opener_route_id,
+    int opener_frame_route_id,
     int proxy_route_id,
     int32 max_page_id,
     const FrameReplicationState& replicated_frame_state,
@@ -258,7 +258,7 @@ bool TestRenderViewHost::CreateRenderView(
   DCHECK(!IsRenderViewLive());
   set_renderer_initialized(true);
   DCHECK(IsRenderViewLive());
-  opener_route_id_ = opener_route_id;
+  opener_frame_route_id_ = opener_frame_route_id;
   RenderFrameHost* main_frame = GetMainFrame();
   if (main_frame)
     static_cast<RenderFrameHostImpl*>(main_frame)->SetRenderFrameCreated(true);