[content shell] gracefully deal with process switches

content/shell/webkit_test_controller.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/shell/webkit_test_controller.h"
 
 #include <iostream>
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/process_util.h"
 #include "base/run_loop.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "content/public/browser/devtools_manager.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
+#include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
 #include "content/shell/shell.h"
 #include "content/shell/shell_browser_context.h"
 #include "content/shell/shell_content_browser_client.h"
 #include "content/shell/shell_messages.h"
 #include "content/shell/shell_switches.h"
 #include "content/shell/webkit_test_helpers.h"
 #include "webkit/glue/glue_serialize.h"
 #include "webkit/support/webkit_support_gfx.h"
 
@@ skipping 172 matching lines @@
   test_url_ = test_url;
   printer_->reset();
   ShellBrowserContext* browser_context =
       ShellContentBrowserClient::Get()->browser_context();
   if (test_url.spec().find("compositing/") != std::string::npos)
     is_compositing_test_ = true;
   gfx::Size initial_size(kTestWindowWidthDip, kTestWindowHeightDip);
   // The W3C SVG layout tests use a different size than the other layout tests.
   if (test_url.spec().find("W3C-SVG-1.1") != std::string::npos)
     initial_size = gfx::Size(kTestSVGWindowWidthDip, kTestSVGWindowHeightDip);
+  if (main_window_ &&
+      !SiteInstance::IsSameWebSite(
+          browser_context,
+          main_window_->web_contents()->GetSiteInstance()->GetSiteURL(),
+          test_url)) {
+    base::RunLoop run_loop;
+    DiscardMainWindow();
+    run_loop.Run();
+  }
   if (!main_window_) {
     main_window_ = content::Shell::CreateNewWindow(
         browser_context,
         GURL(),
         NULL,
         MSG_ROUTING_NONE,
         initial_size);
     WebContentsObserver::Observe(main_window_->web_contents());
     send_configuration_to_next_host_ = true;
     current_pid_ = base::kNullProcessId;
@@ skipping 390 matching lines @@
       open_windows[i]->Close();
   }
   MessageLoop::current()->RunUntilIdle();
 }
 
 void WebKitTestController::OnResetDone() {
   MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure());
 }
 
 }  // namespace content