Revert of Retry to add MockPresentationClient to use in layout tests.

content/shell/renderer/test_runner/web_frame_test_proxy.h

 // Copyright 2014 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.
 
 #ifndef CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_
 #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"
 #include "content/shell/renderer/test_runner/web_test_delegate.h"
 #include "content/shell/renderer/test_runner/web_test_proxy.h"
 #include "content/test/test_media_stream_renderer_factory.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 
 namespace content {
 
@@ skipping 14 matching lines @@
     blink::WebPlugin* plugin = base_proxy_->CreatePlugin(frame, params);
     if (plugin)
       return plugin;
     return Base::createPlugin(frame, params);
   }
 
   virtual blink::WebScreenOrientationClient* webScreenOrientationClient() {
     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,
                                       const blink::WebString& stack_trace) {
     base_proxy_->DidAddMessageToConsole(message, source_name, source_line);
     Base::didAddMessageToConsole(
         message, source_name, source_line, stack_trace);
   }
 
   virtual bool canCreatePluginWithoutRenderer(
@@ skipping 235 matching lines @@
 #if defined(ENABLE_WEBRTC)
   virtual scoped_ptr<MediaStreamRendererFactory> CreateRendererFactory()
       override {
     return scoped_ptr<MediaStreamRendererFactory>(
         new TestMediaStreamRendererFactory());
   }
 #endif
 
   WebTestProxyBase* base_proxy_;
 
-  scoped_ptr<MockPresentationClient> mock_presentation_client_;
-
   DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_