Change IsSwappedOut to const and do a more restrictive check.

content/browser/web_contents/render_view_host_manager.cc

Index: content/browser/web_contents/render_view_host_manager.cc
diff --git a/content/browser/web_contents/render_view_host_manager.cc b/content/browser/web_contents/render_view_host_manager.cc
index 3f14460dfde1edcf93baaf9be8ed98558ae8f65a..f551fc612239b1ae76ccd00e33f519c2e0750fb6 100644
--- a/content/browser/web_contents/render_view_host_manager.cc
+++ b/content/browser/web_contents/render_view_host_manager.cc
@@ -975,12 +975,16 @@ void RenderViewHostManager::RenderViewDeleted(RenderViewHost* rvh) {
   }
 }
 
-bool RenderViewHostManager::IsSwappedOut(RenderViewHost* rvh) {
+bool RenderViewHostManager::IsSwappedOut(RenderViewHost* rvh) const {
   if (!rvh->GetSiteInstance())
     return false;
 
-  return swapped_out_hosts_.find(rvh->GetSiteInstance()->GetId()) !=
-      swapped_out_hosts_.end();
+  RenderViewHostMap::const_iterator iter = swapped_out_hosts_.find(

[Charlie Reis, 2013/04/15 21:14:02]

Good catch.  Can you add a comment here?  Something like:
"Only consider |rvh| swapped out if we can actually find it within
swapped_out_hosts_."

Actually, I wonder if we want to change the method name...  There's already a
RenderViewHostImpl::is_swapped_out(), so we kind of want to indicate that we're
checking whether it's local to this RVHM.  Would RVHM::IsOnSwappedOutList be
better or more confusing?

[nasko, 2013/04/15 21:52:46]

Rename sounds like the better option. I like your proposal for a new name, so
I've gone through with it.

+      rvh->GetSiteInstance()->GetId());
+  if (iter == swapped_out_hosts_.end())
+    return false;
+
+  return iter->second == rvh;
 }
 
 RenderViewHostImpl* RenderViewHostManager::GetSwappedOutRenderViewHost(