Remove swapped-out usage in --site-per-process.

content/browser/renderer_host/render_view_host_impl.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/browser/renderer_host/render_view_host_impl.h"
 
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 10 matching lines @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/sys_info.h"
 #include "base/time/time.h"
 #include "base/trace_event/trace_event.h"
 #include "base/values.h"
 #include "cc/base/switches.h"
 #include "content/browser/bad_message.h"
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/dom_storage/session_storage_namespace_impl.h"
 #include "content/browser/frame_host/frame_tree.h"
+#include "content/browser/frame_host/render_frame_proxy_host.h"
 #include "content/browser/gpu/compositor_util.h"
 #include "content/browser/gpu/gpu_data_manager_impl.h"
 #include "content/browser/gpu/gpu_process_host.h"
 #include "content/browser/gpu/gpu_surface_tracker.h"
 #include "content/browser/host_zoom_map_impl.h"
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
 #include "content/browser/renderer_host/dip_util.h"
 #include "content/browser/renderer_host/media/audio_renderer_host.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/renderer_host/render_view_host_delegate.h"
@@ skipping 281 matching lines @@
   params.proxy_routing_id = proxy_route_id;
   params.hidden = is_hidden();
   params.never_visible = delegate_->IsNeverVisible();
   params.window_was_created_with_opener = window_was_created_with_opener;
   params.next_page_id = next_page_id;
   params.enable_auto_resize = auto_resize_enabled();
   params.min_size = min_size_for_auto_resize();
   params.max_size = max_size_for_auto_resize();
   GetResizeParams(&params.initial_size);
   if (!is_active_) {
-    params.replicated_frame_state =
-        static_cast<RenderFrameHostImpl*>(GetMainFrame())->frame_tree_node()
-            ->current_replication_state();
+    if (main_frame_routing_id_ != MSG_ROUTING_NONE) {
+      params.replicated_frame_state =

[Charlie Reis, 2015/06/04 00:02:11]

Maybe we should just pass in the FrameReplicationState to CreateRenderView (to
avoid the DEPS exception)?  RFHM could probably pass the right value to
WebContentsImpl to here for the most common case.

[nasko, 2015/06/04 16:45:08]

Done.

+          static_cast<RenderFrameHostImpl*>(GetMainFrame())->frame_tree_node()
+              ->current_replication_state();
+    } else {
+      CHECK_NE(params.proxy_routing_id, MSG_ROUTING_NONE);
+      params.replicated_frame_state =
+          RenderFrameProxyHost::FromID(GetProcess()->GetID(), proxy_route_id)
+              ->frame_tree_node()->current_replication_state();
+    }
   }
 
   if (!Send(new ViewMsg_New(params)))
     return false;
   SetInitialRenderSizeParams(params.initial_size);
 
   // If the RWHV has not yet been set, the surface ID namespace will get
   // passed down by the call to SetView().
   if (view_) {
     Send(new ViewMsg_SetSurfaceIdNamespace(GetRoutingID(),
                                            view_->GetSurfaceIdNamespace()));
   }
 
   // If it's enabled, tell the renderer to set up the Javascript bindings for
   // sending messages back to the browser.
   if (GetProcess()->IsIsolatedGuest())
     DCHECK_EQ(0, enabled_bindings_);
   Send(new ViewMsg_AllowBindings(GetRoutingID(), enabled_bindings_));
   // Let our delegate know that we created a RenderView.
   delegate_->RenderViewCreated(this);
 
   // Since this method creates the main RenderFrame in the renderer process,

[Charlie Reis, 2015/06/04 00:02:11]

can create

[nasko, 2015/06/04 14:57:13]

Done.

   // set the proper state on its corresponding RenderFrameHost.
-  RenderFrameHostImpl::FromID(GetProcess()->GetID(), main_frame_routing_id_)
-      ->SetRenderFrameCreated(true);
+  if (main_frame_routing_id_ != MSG_ROUTING_NONE) {
+    RenderFrameHostImpl::FromID(GetProcess()->GetID(), main_frame_routing_id_)
+        ->SetRenderFrameCreated(true);
+  }
 
   return true;
 }
 
 bool RenderViewHostImpl::IsRenderViewLive() const {
   return GetProcess()->HasConnection() && renderer_initialized();
 }
 
 void RenderViewHostImpl::SyncRendererPrefs() {
   RendererPreferences renderer_preferences =
@@ skipping 1062 matching lines @@
     if (!policy->CanReadFile(GetProcess()->GetID(), file))
       policy->GrantReadFile(GetProcess()->GetID(), file);
   }
 }
 
 void RenderViewHostImpl::SelectWordAroundCaret() {
   Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID()));
 }
 
 }  // namespace content