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

content/shell/renderer/test_runner/web_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_TEST_PROXY_H_
 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_TEST_PROXY_H_
 
 #include <deque>
 #include <map>
 #include <string>
@@ skipping 58 matching lines @@
 struct WebPluginParams;
 struct WebPoint;
 struct WebSize;
 struct WebWindowFeatures;
 typedef unsigned WebColor;
 }
 
 namespace content {
 
 class MockCredentialManagerClient;
-class MockPresentationService;
 class MockScreenOrientationClient;
 class MockWebSpeechRecognizer;
 class MockWebUserMediaClient;
 class RenderFrame;
 class SpellCheckClient;
 class TestInterfaces;
 class WebTestDelegate;
 class WebTestInterfaces;
 
 // WebTestProxyBase is the "brain" of WebTestProxy in the sense that
@@ skipping 35 matching lines @@
   void DidCloseChooser();
   bool IsChooserShown();
 
   void DisplayAsyncThen(const base::Closure& callback);
 
   void GetScreenOrientationForTesting(blink::WebScreenInfo&);
   MockScreenOrientationClient* GetScreenOrientationClientMock();
   blink::WebMIDIClientMock* GetMIDIClientMock();
   MockWebSpeechRecognizer* GetSpeechRecognizerMock();
   MockCredentialManagerClient* GetCredentialManagerClientMock();
-  MockPresentationService* GetPresentationServiceMock();
 
   WebTaskList* mutable_task_list() { return &task_list_; }
 
   blink::WebView* GetWebView() const;
 
   void PostSpellCheckEvent(const blink::WebString& event_name);
 
   void SetAcceptLanguages(const std::string& accept_languages);
 
  protected:
@@ skipping 118 matching lines @@
   bool animate_scheduled_;
   std::map<unsigned, std::string> resource_identifier_map_;
 
   bool log_console_output_;
   int chooser_count_;
 
   scoped_ptr<MockCredentialManagerClient> credential_manager_client_;
   scoped_ptr<blink::WebMIDIClientMock> midi_client_;
   scoped_ptr<MockWebSpeechRecognizer> speech_recognizer_;
   scoped_ptr<MockScreenOrientationClient> screen_orientation_client_;
-  scoped_ptr<MockPresentationService> presentation_service_;
 
   std::string accept_languages_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WebTestProxyBase);
 };
 
 // WebTestProxy is used during LayoutTests and always instantiated, at time of
 // writing with Base=RenderViewImpl. It does not directly inherit from it for
 // layering purposes.
@@ skipping 112 matching lines @@
 
  private:
   virtual ~WebTestProxy() {}
 
   DISALLOW_COPY_AND_ASSIGN(WebTestProxy);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_TEST_PROXY_H_