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

content/test/test_render_view_host.cc

 // Copyright (c) 2012 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/test/test_render_view_host.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/dom_storage/dom_storage_context_wrapper.h"
 #include "content/browser/dom_storage/session_storage_namespace_impl.h"
@@ skipping 207 matching lines @@
     bool swapped_out)
     : RenderViewHostImpl(instance,
                          delegate,
                          widget_delegate,
                          routing_id,
                          main_frame_routing_id,
                          swapped_out,
                          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.
   new TestRenderWidgetHostView(this);
 }
 
 TestRenderViewHost::~TestRenderViewHost() {
   if (delete_counter_)
     ++*delete_counter_;
 }
 
 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,
     bool window_was_created_with_opener) {
   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);
 
   return true;
 }
 
 bool TestRenderViewHost::IsFullscreenGranted() const {
   return RenderViewHostImpl::IsFullscreenGranted();
 }
@@ skipping 58 matching lines @@
 
 TestRenderFrameHost* RenderViewHostImplTestHarness::main_test_rfh() {
   return contents()->GetMainFrame();
 }
 
 TestWebContents* RenderViewHostImplTestHarness::contents() {
   return static_cast<TestWebContents*>(web_contents());
 }
 
 }  // namespace content