[content shell] add support for invoking testRunner.notifyDone in a different process

content/shell/webkit_test_runner.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.h"
 
 #include <algorithm>
 #include <clocale>
 #include <cmath>
 
@@ skipping 29 matching lines @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebArrayBufferView.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebContextMenuData.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsAgent.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDeviceOrientation.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebHistoryItem.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptSource.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebTestingSupport.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/WebTask.h"
 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestInterfaces.h"
 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestProxy.h"
 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestRunner.h"
 #include "ui/gfx/rect.h"
 #include "webkit/base/file_path_string_conversions.h"
 #include "webkit/glue/glue_serialize.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webpreferences.h"
 #include "webkit/mocks/test_media_stream_client.h"
 
 using WebKit::Platform;
 using WebKit::WebArrayBufferView;
 using WebKit::WebContextMenuData;
 using WebKit::WebDevToolsAgent;
 using WebKit::WebDeviceOrientation;
 using WebKit::WebElement;
 using WebKit::WebFrame;
 using WebKit::WebGamepads;
 using WebKit::WebHistoryItem;
 using WebKit::WebMediaPlayer;
 using WebKit::WebMediaPlayerClient;
 using WebKit::WebPoint;
 using WebKit::WebRect;
+using WebKit::WebScriptSource;
 using WebKit::WebSize;
 using WebKit::WebString;
 using WebKit::WebURL;
 using WebKit::WebURLError;
 using WebKit::WebURLRequest;
 using WebKit::WebTestingSupport;
 using WebKit::WebVector;
 using WebKit::WebView;
 using WebTestRunner::WebPreferences;
 using WebTestRunner::WebTask;
@@ skipping 312 matching lines @@
              result.substr(strlen("file:////"));
   }
   return rewriteLayoutTestsURL(result).spec();
 }
 
 void WebKitTestRunner::setLocale(const std::string& locale) {
   setlocale(LC_ALL, locale.c_str());
 }
 
 void WebKitTestRunner::testFinished() {
-  if (!is_main_window_)
+  if (!is_main_window_) {
+    Send(new ShellViewHostMsg_TestFinishedInSecondaryWindow(routing_id()));
     return;
+  }
   WebTestInterfaces* interfaces =
       ShellRenderProcessObserver::GetInstance()->test_interfaces();
   interfaces->setTestIsRunning(false);
   if (interfaces->testRunner()->shouldDumpBackForwardList()) {
     SyncNavigationStateVisitor visitor;
     RenderView::ForEach(&visitor);
     Send(new ShellViewHostMsg_CaptureSessionHistory(routing_id()));
   } else {
     CaptureDump();
   }
@@ skipping 90 matching lines @@
   ShellRenderProcessObserver::GetInstance()->test_interfaces()->bindTo(frame);
 }
 
 bool WebKitTestRunner::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(WebKitTestRunner, message)
     IPC_MESSAGE_HANDLER(ShellViewMsg_SetTestConfiguration,
                         OnSetTestConfiguration)
     IPC_MESSAGE_HANDLER(ShellViewMsg_SessionHistory, OnSessionHistory)
     IPC_MESSAGE_HANDLER(ShellViewMsg_Reset, OnReset)
+    IPC_MESSAGE_HANDLER(ShellViewMsg_NotifyDone, OnNotifyDone)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
   return handled;
 }
 
 void WebKitTestRunner::Navigate(const GURL& url) {
+

[Mike West, 2013/04/08 13:50:50]

Nit: Extra newline.

   focus_on_next_commit_ = true;
+  if (!is_main_window_ &&
+      ShellRenderProcessObserver::GetInstance()->main_test_runner() == this) {
+    WebTestInterfaces* interfaces =
+        ShellRenderProcessObserver::GetInstance()->test_interfaces();
+    interfaces->setTestIsRunning(true);
+    interfaces->configureForTestWithURL(GURL(), false);

[Mike West, 2013/04/08 13:50:50]

When does this kick in? I don't understand when the main test runner wouldn't be
in the main window.

[jochen (gone - plz use gerrit), 2013/04/08 13:53:40]

The main test runner is per process, while the main window is globally unique,
i.e. this is true for the first RV in all but the first process.

+  }
 }
 
 void WebKitTestRunner::DidCommitProvisionalLoad(WebFrame* frame,
                                                 bool is_new_navigation) {
   if (!focus_on_next_commit_)
     return;
   focus_on_next_commit_ = false;
   render_view()->GetWebView()->setFocusedFrame(frame);
 }
 
@@ skipping 116 matching lines @@
 void WebKitTestRunner::OnReset() {
   ShellRenderProcessObserver::GetInstance()->test_interfaces()->resetAll();
   Reset();
   // Navigating to about:blank will make sure that no new loads are initiated
   // by the renderer.
   render_view()->GetWebView()->mainFrame()
       ->loadRequest(WebURLRequest(GURL("about:blank")));
   Send(new ShellViewHostMsg_ResetDone(routing_id()));
 }
 
+void WebKitTestRunner::OnNotifyDone() {
+  render_view()->GetWebView()->mainFrame()->executeScript(
+      WebScriptSource(WebString::fromUTF8("testRunner.notifyDone();")));
+}
+
 }  // namespace content