[content shell] link against the TestRunner library

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/message_loop.h"
@@ skipping 75 matching lines @@
   if (state_ != IN_IMAGE_BLOCK)
     return;
   if (!capture_text_only_) {
     *output_ << "#EOF\n";
     output_->flush();
   }
   state_ = AFTER_TEST;
 }
 
 void WebKitTestResultPrinter::AddMessage(const std::string& message) {
+  AddMessageRaw(message + "\n");
+}
+
+void WebKitTestResultPrinter::AddMessageRaw(const std::string& message) {
   if (state_ != IN_TEXT_BLOCK)
     return;
-  *output_ << message << "\n";
+  *output_ << message;
 }
 
 void WebKitTestResultPrinter::AddErrorMessage(const std::string& message) {
   if (state_ != IN_TEXT_BLOCK)
     return;
   *output_ << message << "\n";
   if (!capture_text_only_)
     *error_ << message << "\n";
   PrintTextFooter();
   PrintImageFooter();
@@ skipping 36 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;
 }
 
 void WebKitTestController::RendererUnresponsive() {
   printer_->AddErrorMessage("#PROCESS UNRESPONSIVE - renderer");
 }
 
 void WebKitTestController::NotifyDone() {
   if (!wait_until_done_)
     return;
@@ skipping 20 matching lines @@
     const std::string& property_name) {
   printer_->AddErrorMessage(
       std::string("FAIL: NOT IMPLEMENTED: ") +
       object_name + "." + property_name);
 }
 
 bool WebKitTestController::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(WebKitTestController, message)
     IPC_MESSAGE_HANDLER(ShellViewHostMsg_DidFinishLoad, OnDidFinishLoad)
+    IPC_MESSAGE_HANDLER(ShellViewHostMsg_PrintMessage, OnPrintMessage)
     IPC_MESSAGE_HANDLER(ShellViewHostMsg_TextDump, OnTextDump)
     IPC_MESSAGE_HANDLER(ShellViewHostMsg_ImageDump, OnImageDump)
     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() {
+  if (did_set_as_main_window_)
+    return;
+  RenderViewHost* render_view_host =
+      main_window_->web_contents()->GetRenderViewHost();
+  render_view_host->Send(new ShellViewMsg_SetIsMainWindow(
+      render_view_host->GetRoutingID()));
+  did_set_as_main_window_ = true;
+}
+
 void WebKitTestController::RenderViewGone(base::TerminationStatus status) {
   printer_->AddErrorMessage("#CRASHED - renderer");
 }
 
 void WebKitTestController::WebContentsDestroyed(WebContents* web_contents) {
   main_window_ = NULL;
   printer_->AddErrorMessage("FAIL: main window was destroyed");
 }
 
 void WebKitTestController::CaptureDump() {
@@ skipping 75 matching lines @@
 
 void WebKitTestController::OnTextDump(const std::string& dump) {
   printer_->PrintTextBlock(dump);
   printer_->PrintTextFooter();
   if (dump_as_text_ || !enable_pixel_dumping_) {
     printer_->PrintImageFooter();
     MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure());
   }
 }
 
+void WebKitTestController::OnPrintMessage(const std::string& message) {
+  printer_->AddMessageRaw(message);
+}
+
 // WebKitTestRunnerHost -------------------------------------------------------
 
 WebKitTestRunnerHost::WebKitTestRunnerHost(
     RenderViewHost* render_view_host)
     : RenderViewHostObserver(render_view_host) {
 }
 
 WebKitTestRunnerHost::~WebKitTestRunnerHost() {
 }
 
@@ skipping 44 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