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..df914f82ce438a44d3f6b458ba45debfdf73b106 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,14 @@ class WebFrameTestProxy : public Base {
     return base_proxy_->GetScreenOrientationClientMock();
   }
 
+  virtual blink::WebPresentationClient* presentationClient() {
+    if (!mock_presentation_client_.get()) {
+      mock_presentation_client_.reset(new MockPresentationClient(
+          base_proxy_->GetPresentationServiceMock()));
+    }
+    return mock_presentation_client_.get();
+  }
+
   virtual void didAddMessageToConsole(const blink::WebConsoleMessage& message,
                                       const blink::WebString& source_name,
                                       unsigned source_line,
@@ -295,6 +304,8 @@ class WebFrameTestProxy : public Base {
 
   WebTestProxyBase* base_proxy_;
 
+  scoped_ptr<MockPresentationClient> mock_presentation_client_;
+
   DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy);
 };