Prevent creating a swapped out RVH in the same SiteInstance as the current one.

content/public/test/browser_test_utils.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/public/test/browser_test_utils.h"
 
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/path_service.h"
 #include "base/process/kill.h"
@@ skipping 196 matching lines @@
   // In many cases, the load may have finished before we get here.  Only wait if
   // the tab still has a pending navigation.
   if (!web_contents->IsLoading())
     return;
   load_stop_observer.Wait();
 }
 
 void CrashTab(WebContents* web_contents) {
   RenderProcessHost* rph = web_contents->GetRenderProcessHost();
   WindowedNotificationObserver observer(
-      NOTIFICATION_RENDERER_PROCESS_CLOSED,
+      NOTIFICATION_RENDERER_PROCESS_TERMINATED,

[ncarter (slow), 2013/11/12 03:38:26]

Change this back to to NOTIFICATION_RENDERER_PROCESS_CLOSED, otherwise you'll
see test hangs in various existing code.

[Charlie Reis, 2013/11/12 16:09:35]

Done.

       Source<RenderProcessHost>(rph));
+  LOG(INFO) << "CrashTab: Calling KillProcess.";
   base::KillProcess(rph->GetHandle(), 0, false);
+  LOG(INFO) << "CrashTab: Waiting for process to exit...";
   observer.Wait();
 }
 
 void SimulateMouseClick(WebContents* web_contents,
                         int modifiers,
                         WebKit::WebMouseEvent::Button button) {
   int x = web_contents->GetView()->GetContainerSize().width() / 2;
   int y = web_contents->GetView()->GetContainerSize().height() / 2;
   SimulateMouseClickAt(web_contents, modifiers, button, gfx::Point(x, y));
 }
@@ skipping 404 matching lines @@
   // The queue should not be empty, unless we were quit because of a timeout.
   if (message_queue_.empty())
     return false;
   if (message)
     *message = message_queue_.front();
   message_queue_.pop();
   return true;
 }
 
 }  // namespace content