Revert of Extract WebFrameClient implementation out of WebTestProxyBase.

components/test_runner/test_runner.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 COMPONENTS_TEST_RUNNER_TEST_RUNNER_H_
 #define COMPONENTS_TEST_RUNNER_TEST_RUNNER_H_
 
 #include <stdint.h>
 
 #include <deque>
@@ skipping 24 matching lines @@
 
 namespace gin {
 class ArrayBufferView;
 class Arguments;
 }
 
 namespace test_runner {
 
 class InvokeCallbackTask;
 class MockScreenOrientationClient;
-class MockWebUserMediaClient;
 class TestInterfaces;
 class WebContentSettings;
 class WebTestDelegate;
 class WebTestProxyBase;
 
 class TestRunner : public WebTestRunner,
                    public base::SupportsWeakPtr<TestRunner> {
  public:
   explicit TestRunner(TestInterfaces*);
   virtual ~TestRunner();
@@ skipping 19 matching lines @@
   bool ShouldDumpAsAudio() const override;
   void GetAudioData(std::vector<unsigned char>* buffer_view) const override;
   bool IsRecursiveLayoutDumpRequested() override;
   std::string DumpLayout(blink::WebLocalFrame* frame) override;
   void ReplicateLayoutTestRuntimeFlagsChanges(
       const base::DictionaryValue& changed_values) override;
   bool HasCustomTextDump(std::string* custom_text_dump) const override;
   bool ShouldDumpBackForwardList() const override;
   blink::WebContentSettingsClient* GetWebContentSettings() const override;
 
-  // Methods used by WebTestProxyBase and WebFrameTestClient.
+  // Methods used by WebTestProxyBase.
   bool shouldStayOnPageAfterHandlingBeforeUnload() const;
   MockScreenOrientationClient* getMockScreenOrientationClient();
-  MockWebUserMediaClient* getMockWebUserMediaClient();
   bool shouldDumpSelectionRect() const;
   bool isPrinting() const;
   bool shouldDumpAsTextWithPixelResults();
   bool shouldDumpAsCustomText() const;
   std:: string customDumpText() const;
   void ShowDevTools(const std::string& settings,
                     const std::string& frontend_url);
   void ClearDevToolsLocalStorage();
   void setShouldDumpAsText(bool);
   void setShouldDumpAsMarkup(bool);
@@ skipping 27 matching lines @@
   bool shouldDumpResourcePriorities() const;
   bool RequestPointerLock();
   void RequestPointerUnlock();
   bool isPointerLocked();
   void setToolTipText(const blink::WebString&);
   bool shouldDumpDragImage();
   bool shouldDumpNavigationPolicy() const;
 
   bool midiAccessorResult();
 
-  // Methods used by MockColorChooser:
-  void DidOpenChooser();
-  void DidCloseChooser();
-
   // A single item in the work queue.
   class WorkItem {
    public:
     virtual ~WorkItem() {}
 
     // Returns true if this started a load.
     virtual bool Run(WebTestDelegate*, blink::WebView*) = 0;
   };
 
  private:
@@ skipping 666 matching lines @@
 
   bool pointer_locked_;
   enum {
     PointerLockWillSucceed,
     PointerLockWillRespondAsync,
     PointerLockWillFailSync,
   } pointer_lock_planned_result_;
   bool use_mock_theme_;
 
   scoped_ptr<MockScreenOrientationClient> mock_screen_orientation_client_;
-  scoped_ptr<MockWebUserMediaClient> user_media_client_;
-
-  // Number of currently active color choosers.
-  int chooser_count_;
 
   base::WeakPtrFactory<TestRunner> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(TestRunner);
 };
 
 }  // namespace test_runner
 
 #endif  // COMPONENTS_TEST_RUNNER_TEST_RUNNER_H_