Extract WebViewClient implementation out of WebTestProxyBase.

components/test_runner/web_test_interfaces.cc

 // 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.
 
 #include "components/test_runner/web_test_interfaces.h"
 
 #include <utility>
 
 #include "components/test_runner/app_banner_client.h"
 #include "components/test_runner/event_sender.h"
 #include "components/test_runner/mock_web_audio_device.h"
 #include "components/test_runner/mock_web_media_stream_center.h"
 #include "components/test_runner/mock_web_midi_accessor.h"
 #include "components/test_runner/mock_webrtc_peer_connection_handler.h"
 #include "components/test_runner/test_interfaces.h"
 #include "components/test_runner/test_runner.h"
 #include "components/test_runner/web_frame_test_client.h"
+#include "components/test_runner/web_view_test_client.h"
 
 using namespace blink;
 
 namespace test_runner {
 
 WebTestInterfaces::WebTestInterfaces() : interfaces_(new TestInterfaces()) {
 }
 
 WebTestInterfaces::~WebTestInterfaces() {
 }
@@ skipping 63 matching lines @@
 WebTestInterfaces::CreateAppBannerClient() {
   scoped_ptr<AppBannerClient> client(new AppBannerClient);
   interfaces_->SetAppBannerClient(client.get());
   return std::move(client);
 }
 
 AppBannerClient* WebTestInterfaces::GetAppBannerClient() {
   return interfaces_->GetAppBannerClient();
 }
 
-blink::WebFrameClient* WebTestInterfaces::GetWebFrameTestClient() {
-  if (!web_frame_test_client_) {
-    web_frame_test_client_.reset(new WebFrameTestClient(
+scoped_ptr<WebFrameTestClient> WebTestInterfaces::CreateWebFrameTestClient() {
+  return make_scoped_ptr(new WebFrameTestClient(
         interfaces_->GetTestRunner(),
         interfaces_->GetDelegate(),
         interfaces_->GetAccessibilityController(),
         interfaces_->GetEventSender()));
-  }
-  return web_frame_test_client_.get();
+}
+
+scoped_ptr<WebViewTestClient> WebTestInterfaces::CreateWebViewTestClient(
+    WebTestProxyBase* web_test_proxy_base) {
+  return make_scoped_ptr(new WebViewTestClient(
+        interfaces_->GetTestRunner(), interfaces_->GetDelegate(),
+        interfaces_->GetEventSender(), web_test_proxy_base));
 }
 
 }  // namespace test_runner