Add IPC benchmarking API to Blink TestRunner

content/shell/renderer/webkit_test_runner.cc

Index: content/shell/renderer/webkit_test_runner.cc
diff --git a/content/shell/renderer/webkit_test_runner.cc b/content/shell/renderer/webkit_test_runner.cc
index 6a539cfde546b906052b6afb38ea280e643adfe3..20984f7eee0299c4f36b50568ba8abfc44f5de5a 100644
--- a/content/shell/renderer/webkit_test_runner.cc
+++ b/content/shell/renderer/webkit_test_runner.cc
@@ -30,6 +30,7 @@
 #include "content/shell/common/shell_switches.h"
 #include "content/shell/common/webkit_test_helpers.h"
 #include "content/shell/renderer/gc_controller.h"
+#include "content/shell/renderer/ipc_echo.h"
 #include "content/shell/renderer/leak_detector.h"
 #include "content/shell/renderer/shell_render_process_observer.h"
 #include "content/shell/renderer/test_runner/WebTask.h"
@@ -562,6 +563,26 @@ std::string WebKitTestRunner::dumpHistoryForWindow(WebTestProxyBase* proxy) {
                              current_entry_indexes_[pos]);
 }
 
+void WebKitTestRunner::requestEcho(int id, int size) {
+  if (!ipc_echo_) {
+    RenderView* view = render_view();
+    ipc_echo_.reset(new IPCEcho(view->GetWebView()->mainFrame()->document(),
+                                view, view->GetRoutingID()));
+  }
+
+  ipc_echo_->RequestEcho(id, size);
+}
+
+int WebKitTestRunner::lastEchoId() {
+  DCHECK(ipc_echo_);

[sof, 2014/08/16 15:45:52]

This is an unsound assumption. For code that traverses the properties hanging
off of "window" (include "window.testing") -- e.g., a test using
LayoutTests/fast/dom/Window/resources/window-property-collector.js, it might
touch lastEchoId without invoking requestEcho() first.

This is currently causing half a dozen assert crashes across the bots,


http://build.chromium.org/p/chromium.webkit/builders/WebKit%20Linux/builds/35621

http://build.chromium.org/p/chromium.webkit/builders/WebKit%20Mac10.9/builds/...
 
Revert or address right away?

+  return ipc_echo_->last_echo_id();
+}
+
+int WebKitTestRunner::lastEchoSize() {
+  DCHECK(ipc_echo_);
+  return ipc_echo_->last_echo_size();
+}
+
 // RenderViewObserver  --------------------------------------------------------
 
 void WebKitTestRunner::DidClearWindowObject(WebLocalFrame* frame) {
@@ -573,6 +594,7 @@ void WebKitTestRunner::DidClearWindowObject(WebLocalFrame* frame) {
 bool WebKitTestRunner::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(WebKitTestRunner, message)
+    IPC_MESSAGE_HANDLER(ShellViewMsg_EchoPong, OnEchoPong)
     IPC_MESSAGE_HANDLER(ShellViewMsg_SetTestConfiguration,
                         OnSetTestConfiguration)
     IPC_MESSAGE_HANDLER(ShellViewMsg_SessionHistory, OnSessionHistory)
@@ -692,6 +714,10 @@ void WebKitTestRunner::CaptureDumpComplete() {
                  new ShellViewHostMsg_TestFinished(routing_id())));
 }
 
+void WebKitTestRunner::OnEchoPong(int id, const std::string& body) {
+  ipc_echo_->DidRespondEcho(id, body.size());
+}
+
 void WebKitTestRunner::OnSetTestConfiguration(
     const ShellTestConfiguration& params) {
   test_config_ = params;