Use correct WebView from EventSender.

components/test_runner/web_frame_test_client.cc

 // Copyright 2016 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_frame_test_client.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "components/test_runner/accessibility_controller.h"
 #include "components/test_runner/event_sender.h"
 #include "components/test_runner/mock_color_chooser.h"
 #include "components/test_runner/mock_screen_orientation_client.h"
 #include "components/test_runner/mock_web_user_media_client.h"
 #include "components/test_runner/test_common.h"
+#include "components/test_runner/test_interfaces.h"
 #include "components/test_runner/test_plugin.h"
 #include "components/test_runner/test_runner.h"
 #include "components/test_runner/web_test_delegate.h"
+#include "components/test_runner/web_test_proxy.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/public/platform/WebURLResponse.h"
 #include "third_party/WebKit/public/web/WebConsoleMessage.h"
 #include "third_party/WebKit/public/web/WebElement.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebNavigationPolicy.h"
 #include "third_party/WebKit/public/web/WebPluginParams.h"
@@ skipping 161 matching lines @@
     return;
   test_runner->setTopLoadingFrame(frame, true);
 }
 
 }  // namespace
 
 WebFrameTestClient::WebFrameTestClient(
     TestRunner* test_runner,
     WebTestDelegate* delegate,
     AccessibilityController* accessibility_controller,
-    EventSender* event_sender)
+    WebTestProxyBase* web_test_proxy_base)
     : test_runner_(test_runner),
       delegate_(delegate),
       accessibility_controller_(accessibility_controller),
-      event_sender_(event_sender) {
+      web_test_proxy_base_(web_test_proxy_base) {
   DCHECK(test_runner);
   DCHECK(delegate_);
   DCHECK(accessibility_controller_);
-  DCHECK(event_sender_);
+  DCHECK(web_test_proxy_base_);
 }
 
 WebFrameTestClient::~WebFrameTestClient() {}
 
 blink::WebColorChooser* WebFrameTestClient::createColorChooser(
     blink::WebColorChooserClient* client,
     const blink::WebColor& color,
     const blink::WebVector<blink::WebColorSuggestion>& suggestions) {
   // This instance is deleted by WebCore::ColorInputType
   return new MockColorChooser(client, delegate_, test_runner_);
@@ skipping 173 matching lines @@
 blink::WebPlugin* WebFrameTestClient::createPlugin(
     blink::WebLocalFrame* frame,
     const blink::WebPluginParams& params) {
   if (TestPlugin::IsSupportedMimeType(params.mimeType))
     return TestPlugin::create(frame, params, delegate_);
   return delegate_->CreatePluginPlaceholder(frame, params);
 }
 
 void WebFrameTestClient::showContextMenu(
     const blink::WebContextMenuData& context_menu_data) {
-  event_sender_->SetContextMenuData(context_menu_data);
+  web_test_proxy_base_->event_sender()->SetContextMenuData(context_menu_data);
 }
 
 blink::WebUserMediaClient* WebFrameTestClient::userMediaClient() {
   return test_runner_->getMockWebUserMediaClient();
 }
 
 void WebFrameTestClient::loadURLExternally(
     const blink::WebURLRequest& request,
     blink::WebNavigationPolicy policy,
     const blink::WebString& suggested_name,
@@ skipping 346 matching lines @@
   scoped_ptr<blink::WebSetSinkIdCallbacks> callback(web_callbacks);
   std::string device_id = sink_id.utf8();
   if (device_id == "valid" || device_id.empty())
     callback->onSuccess();
   else if (device_id == "unauthorized")
     callback->onError(blink::WebSetSinkIdError::NotAuthorized);
   else
     callback->onError(blink::WebSetSinkIdError::NotFound);
 }
 
+void WebFrameTestClient::didClearWindowObject(blink::WebLocalFrame* frame) {
+  web_test_proxy_base_->test_interfaces()->BindTo(frame);
+  web_test_proxy_base_->BindTo(frame);
+}
+
 }  // namespace test_runner