Use correct WebView from EventSender.

components/test_runner/test_interfaces.cc

Index: components/test_runner/test_interfaces.cc
diff --git a/components/test_runner/test_interfaces.cc b/components/test_runner/test_interfaces.cc
index a12cc49b696c80f1f669e137d730acfee76516ce..c405f477facb83b38d52217ede56d7ed7d7bae6b 100644
--- a/components/test_runner/test_interfaces.cc
+++ b/components/test_runner/test_interfaces.cc
@@ -15,7 +15,6 @@
 #include "base/values.h"
 #include "components/test_runner/accessibility_controller.h"
 #include "components/test_runner/app_banner_client.h"
-#include "components/test_runner/event_sender.h"
 #include "components/test_runner/gamepad_controller.h"
 #include "components/test_runner/gc_controller.h"
 #include "components/test_runner/test_runner.h"
@@ -30,7 +29,6 @@ namespace test_runner {
 
 TestInterfaces::TestInterfaces()
     : accessibility_controller_(new AccessibilityController()),
-      event_sender_(new EventSender(this)),
       text_input_controller_(new TextInputController()),
       test_runner_(new TestRunner(this)),
       delegate_(nullptr),
@@ -44,13 +42,11 @@ TestInterfaces::TestInterfaces()
 
 TestInterfaces::~TestInterfaces() {
   accessibility_controller_->SetWebView(nullptr);
-  event_sender_->SetWebView(nullptr);
   // gamepad_controller_ doesn't depend on WebView.
   text_input_controller_->SetWebView(nullptr);
   test_runner_->SetWebView(nullptr);
 
   accessibility_controller_->SetDelegate(nullptr);
-  event_sender_->SetDelegate(nullptr);
   // gamepad_controller_ ignores SetDelegate(nullptr)
   // text_input_controller_ doesn't depend on WebTestDelegate.
   test_runner_->SetDelegate(nullptr);
@@ -59,7 +55,6 @@ TestInterfaces::~TestInterfaces() {
 void TestInterfaces::SetWebView(blink::WebView* web_view,
                                 WebTestProxyBase* proxy) {
   accessibility_controller_->SetWebView(web_view);
-  event_sender_->SetWebView(web_view);
   // gamepad_controller_ doesn't depend on WebView.
   text_input_controller_->SetWebView(web_view);
   test_runner_->SetWebView(web_view);
@@ -67,7 +62,6 @@ void TestInterfaces::SetWebView(blink::WebView* web_view,
 
 void TestInterfaces::SetDelegate(WebTestDelegate* delegate) {
   accessibility_controller_->SetDelegate(delegate);
-  event_sender_->SetDelegate(delegate);
   gamepad_controller_ = GamepadController::Create(delegate);
   // text_input_controller_ doesn't depend on WebTestDelegate.
   test_runner_->SetDelegate(delegate);
@@ -76,7 +70,6 @@ void TestInterfaces::SetDelegate(WebTestDelegate* delegate) {
 
 void TestInterfaces::BindTo(blink::WebFrame* frame) {
   accessibility_controller_->Install(frame);
-  event_sender_->Install(frame);
   if (gamepad_controller_)
     gamepad_controller_->Install(frame);
   text_input_controller_->Install(frame);
@@ -86,11 +79,13 @@ void TestInterfaces::BindTo(blink::WebFrame* frame) {
 
 void TestInterfaces::ResetTestHelperControllers() {
   accessibility_controller_->Reset();
-  event_sender_->Reset();
   if (gamepad_controller_)
     gamepad_controller_->Reset();
   // text_input_controller_ doesn't have any state to reset.
   blink::WebCache::clear();
+
+  for (WebTestProxyBase* web_test_proxy_base : window_list_)
+    web_test_proxy_base->Reset();
 }
 
 void TestInterfaces::ResetAll() {
@@ -156,10 +151,6 @@ AccessibilityController* TestInterfaces::GetAccessibilityController() {
   return accessibility_controller_.get();
 }
 
-EventSender* TestInterfaces::GetEventSender() {
-  return event_sender_.get();
-}
-
 TestRunner* TestInterfaces::GetTestRunner() {
   return test_runner_.get();
 }