Extract WebViewClient 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 25 matching lines @@
 
 namespace gin {
 class ArrayBufferView;
 class Arguments;
 }
 
 namespace test_runner {
 
 class InvokeCallbackTask;
 class MockScreenOrientationClient;
+class MockWebSpeechRecognizer;
 class MockWebUserMediaClient;
 class TestInterfaces;
 class WebContentSettings;
 class WebTestDelegate;
 class WebTestProxyBase;
 
 class TestRunner : public WebTestRunner,
                    public base::SupportsWeakPtr<TestRunner> {
  public:
   explicit TestRunner(TestInterfaces*);
@@ skipping 23 matching lines @@
   std::string DumpLayout(blink::WebLocalFrame* frame) override;
   void DumpPixelsAsync(
       blink::WebView* web_view,
       const base::Callback<void(const SkBitmap&)>& callback) 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 WebViewTestClient and WebFrameTestClient.
+  void OnAnimationScheduled(blink::WebView* view);
+  void OnAnimationBegun(blink::WebView* view);
   std::string GetAcceptLanguages() const;
   bool shouldStayOnPageAfterHandlingBeforeUnload() const;
   MockScreenOrientationClient* getMockScreenOrientationClient();
   MockWebUserMediaClient* getMockWebUserMediaClient();
+  MockWebSpeechRecognizer* getMockWebSpeechRecognizer();
   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);
   void setCustomTextOutput(const std::string& text);
@@ skipping 237 matching lines @@
   void SetAllowUniversalAccessFromFileURLs(bool allow);
   void SetAllowFileAccessFromFileURLs(bool allow);
   void OverridePreference(const std::string& key, v8::Local<v8::Value> value);
 
   // Modify accept_languages in RendererPreferences.
   void SetAcceptLanguages(const std::string& accept_languages);
 
   // Enable or disable plugins.
   void SetPluginsEnabled(bool enabled);
 
-  bool AnimationScheduled();
+  // Returns |true| if an animation has been scheduled in one or more WebViews
+  // participating in the layout test.
+  bool GetAnimationScheduled() const;
 
   ///////////////////////////////////////////////////////////////////////////
   // Methods that modify the state of TestRunner
 
   // This function sets a flag that tells the test_shell to print a line of
   // descriptive text for each editing command. It takes no arguments, and
   // ignores any that may be present.
   void DumpEditingCallbacks();
 
   // This function sets a flag that tells the test_shell to dump pages as
@@ skipping 439 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<MockWebSpeechRecognizer> speech_recognizer_;
   scoped_ptr<MockWebUserMediaClient> user_media_client_;
 
   // Number of currently active color choosers.
   int chooser_count_;
 
   // Captured drag image.
   blink::WebImage drag_image_;
 
+  std::set<blink::WebView*> views_with_scheduled_animations_;
+
   base::WeakPtrFactory<TestRunner> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(TestRunner);
 };
 
 }  // namespace test_runner
 
 #endif  // COMPONENTS_TEST_RUNNER_TEST_RUNNER_H_