Extract WebViewClient implementation out of WebTestProxyBase.

components/test_runner/web_test_interfaces.h

 // Copyright 2013 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_WEB_TEST_INTERFACES_H_
 #define COMPONENTS_TEST_RUNNER_WEB_TEST_INTERFACES_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "components/test_runner/test_runner_export.h"
@@ skipping 15 matching lines @@
 }
 
 namespace test_runner {
 
 class AppBannerClient;
 class TestInterfaces;
 class WebFrameTestClient;
 class WebTestDelegate;
 class WebTestProxyBase;
 class WebTestRunner;
+class WebViewTestClient;
 
 class TEST_RUNNER_EXPORT WebTestInterfaces {
  public:
   WebTestInterfaces();
   ~WebTestInterfaces();
 
   void SetWebView(blink::WebView* web_view, WebTestProxyBase* proxy);
   void SetDelegate(WebTestDelegate* delegate);
   void BindTo(blink::WebFrame* frame);
   void ResetAll();
@@ skipping 13 matching lines @@
   blink::WebMIDIAccessor* CreateMIDIAccessor(
       blink::WebMIDIAccessorClient* client);
 
   blink::WebAudioDevice* CreateAudioDevice(double sample_rate);
 
   scoped_ptr<blink::WebAppBannerClient> CreateAppBannerClient();
   AppBannerClient* GetAppBannerClient();
 
   TestInterfaces* GetTestInterfaces();
 
-  // Gets a borrowed pointer to a WebFrameClient implementation providing
-  // test behavior (i.e. forwarding javascript console output to the test
-  // harness).  The caller should guarantee that the returned pointer
-  // won't be used beyond the lifetime of WebTestInterfaces.
-  blink::WebFrameClient* GetWebFrameTestClient();
+  // Creates a WebFrameClient implementation providing test behavior (i.e.
+  // forwarding javascript console output to the test harness).  The caller
+  // should guarantee that the returned object won't be used beyond the lifetime
+  // of WebTestInterfaces.
+  scoped_ptr<WebFrameTestClient> CreateWebFrameTestClient();
+
+  // Creates a WebViewClient implementation providing test behavior (i.e.
+  // providing a mocked speech recognizer).  The caller should guarantee that
+  // the returned pointer won't be used beyond the lifetime of WebTestInterfaces
+  // and/or the lifetime of |web_test_proxy_base|.
+  scoped_ptr<WebViewTestClient> CreateWebViewTestClient(
+      WebTestProxyBase* web_test_proxy_base);
 
  private:
   scoped_ptr<TestInterfaces> interfaces_;
-  scoped_ptr<WebFrameTestClient> web_frame_test_client_;
 
   DISALLOW_COPY_AND_ASSIGN(WebTestInterfaces);
 };
 
 }  // namespace test_runner
 
 #endif  // COMPONENTS_TEST_RUNNER_WEB_TEST_INTERFACES_H_