Retry to add MockPresentationClient to use in layout tests.

content/shell/renderer/test_runner/web_frame_test_proxy.h

Index: content/shell/renderer/test_runner/web_frame_test_proxy.h
diff --git a/content/shell/renderer/test_runner/web_frame_test_proxy.h b/content/shell/renderer/test_runner/web_frame_test_proxy.h
index 12bbbf7c8cfc42598aef610fcc09e1a504a30eb3..c241d3321e36d7f9f56d45300459f1b50523fd1b 100644
--- a/content/shell/renderer/test_runner/web_frame_test_proxy.h
+++ b/content/shell/renderer/test_runner/web_frame_test_proxy.h
@@ -6,6 +6,7 @@
 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_
 
 #include "base/basictypes.h"
+#include "content/shell/renderer/test_runner/mock_presentation_client.h"
 #include "content/shell/renderer/test_runner/mock_screen_orientation_client.h"
 #include "content/shell/renderer/test_runner/test_interfaces.h"
 #include "content/shell/renderer/test_runner/test_runner.h"
@@ -40,6 +41,10 @@ class WebFrameTestProxy : public Base {
     return base_proxy_->GetScreenOrientationClientMock();
   }
 
+  virtual blink::WebPresentationClient* presentationClient() {
+    return base_proxy_->GetPresentationClientMock();

[Peter Beverloo, 2015/02/11 13:44:16]

So, in regards to hierarchy, WebFrameTestProxy is analogous to RenderFrame
whereas WebTestProxy is analogous to RenderView.

You store your mock as a member on WebTestProxy (View-level), whereas the real
PresentationDispatcher is stored on RenderFrameImpl. This means that the crash
you're seeing occurs on pages with an iframe because the
MockPresentationDispatcher is shared between several frames, whereas in
production you've got a different object for each frame.

Perhaps you should consider something like the following:

- MockPresentationClient, owned by WebFrameTestProxy
- MockPresentationService, owned by WebTestProxy

MPC "connects" (in this case: registers) to the MPS when it's being watched,
just like you do with the service. Test runner calls are then made to the MPS,
which calls through to the MPCs registered to it. That's much closer to the real
flow of your feature.

[whywhat, 2015/02/12 16:27:58]

Thanks for digging this up for me, Peter. I followed your suggestion in the
uploaded patch.

+  }
+
   virtual void didAddMessageToConsole(const blink::WebConsoleMessage& message,
                                       const blink::WebString& source_name,
                                       unsigned source_line,