[content shell] change how the main render view is picked for layout tests

content/shell/webkit_test_runner_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/shell/webkit_test_runner_host.h"
 
 #include <iostream>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 146 matching lines @@
   printer_->PrintTextHeader();
   content::ShellBrowserContext* browser_context =
       static_cast<content::ShellContentBrowserClient*>(
           content::GetContentClient()->browser())->browser_context();
   main_window_ = content::Shell::CreateNewWindow(
       browser_context,
       test_url,
       NULL,
       MSG_ROUTING_NONE,
       NULL);
-  did_set_as_main_window_ = false;
   Observe(main_window_->web_contents());
   return true;
 }
 
 bool WebKitTestController::ResetAfterLayoutTest() {
   DCHECK(CalledOnValidThread());
   printer_->PrintTextFooter();
   printer_->PrintImageFooter();
   enable_pixel_dumping_ = false;
   expected_pixel_hash_.clear();
   captured_dump_ = false;
   dump_as_text_ = false;
   dump_child_frames_ = false;
   is_printing_ = false;
   should_stay_on_page_after_handling_before_unload_ = false;
   wait_until_done_ = false;
-  did_set_as_main_window_ = false;
   watchdog_.Cancel();
   if (main_window_) {
     Observe(NULL);
     main_window_ = NULL;
   }
   Shell::CloseAllWindows();
   Send(new ShellViewMsg_ResetAll);
   return true;
 }
 
@@ skipping 41 matching lines @@
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
   return handled;
 }
 
 void WebKitTestController::PluginCrashed(const FilePath& plugin_path) {
   printer_->AddErrorMessage("#CRASHED - plugin");
 }
 
-void WebKitTestController::RenderViewReady() {
-  RenderViewHost* render_view_host =
-      main_window_->web_contents()->GetRenderViewHost();
+void WebKitTestController::RenderViewCreated(RenderViewHost* render_view_host) {
   render_view_host->Send(new ShellViewMsg_SetCurrentWorkingDirectory(
       render_view_host->GetRoutingID(), current_working_directory_));
-  if (did_set_as_main_window_)
-    return;
-  render_view_host->Send(new ShellViewMsg_SetIsMainWindow(
-      render_view_host->GetRoutingID()));
-  did_set_as_main_window_ = true;
 }
 
 void WebKitTestController::RenderViewGone(base::TerminationStatus status) {
-  if (status == base::TERMINATION_STATUS_PROCESS_CRASHED)
+  if (status == base::TERMINATION_STATUS_PROCESS_CRASHED ||
+      status == base::TERMINATION_STATUS_ABNORMAL_TERMINATION) {
     printer_->AddErrorMessage("#CRASHED - renderer");
+  }
 }
 
 void WebKitTestController::WebContentsDestroyed(WebContents* web_contents) {
   main_window_ = NULL;
   printer_->AddErrorMessage("FAIL: main window was destroyed");
 }
 
 void WebKitTestController::CaptureDump() {
   if (captured_dump_ || !main_window_ || !printer_->in_text_block())
     return;
@@ skipping 141 matching lines @@
   WebKitTestController::Get()->WaitUntilDone();
 }
 
 void WebKitTestRunnerHost::OnNotImplemented(
     const std::string& object_name,
     const std::string& property_name) {
   WebKitTestController::Get()->NotImplemented(object_name, property_name);
 }
 
 }  // namespace content