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

content/test/test_render_view_host.h

Index: content/test/test_render_view_host.h
diff --git a/content/test/test_render_view_host.h b/content/test/test_render_view_host.h
index 112879c7a3d76d3b5ac048d90c153acdb930973e..6eb3a243205971beadefd808f7d6f6c2543c7b5c 100644
--- a/content/test/test_render_view_host.h
+++ b/content/test/test_render_view_host.h
@@ -227,21 +227,21 @@ class TestRenderViewHost
     delete_counter_ = delete_counter;
   }
 
-  // The opener route id passed to CreateRenderView().
-  int opener_route_id() const { return opener_route_id_; }
+  // The opener frame route id passed to CreateRenderView().
+  int opener_frame_route_id() const { return opener_frame_route_id_; }
 
   // RenderWidgetHost overrides (same value, but in the Mock* type)
   MockRenderProcessHost* GetProcess() const override;
 
   bool 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) override;
 
   // RenderViewHost overrides --------------------------------------------------
 
-  bool CreateRenderView(int opener_route_id,
+  bool CreateRenderView(int opener_frame_route_id,
                         int proxy_route_id,
                         int32 max_page_id,
                         const FrameReplicationState& replicated_frame_state,
@@ -270,8 +270,8 @@ class TestRenderViewHost
   // See set_delete_counter() above. May be NULL.
   int* delete_counter_;
 
-  // See opener_route_id() above.
-  int opener_route_id_;
+  // See opener_frame_route_id() above.
+  int opener_frame_route_id_;
 
   DISALLOW_COPY_AND_ASSIGN(TestRenderViewHost);
 };