Use correct WebView from EventSender.

components/test_runner/test_interfaces.cc

 // 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.
 
 #include "components/test_runner/test_interfaces.h"
 
 #include <stddef.h>
 
 #include <string>
 
 #include "base/json/json_writer.h"
 #include "base/json/string_escape.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #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"
 #include "components/test_runner/text_input_controller.h"
 #include "components/test_runner/web_test_proxy.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/public/web/WebCache.h"
 #include "third_party/WebKit/public/web/WebKit.h"
 #include "third_party/WebKit/public/web/WebView.h"
 
 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),
       app_banner_client_(nullptr) {
   blink::setLayoutTestMode(true);
   // NOTE: please don't put feature specific enable flags here,
   // instead add them to RuntimeEnabledFeatures.in
 
   ResetAll();
 }
 
 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);
 }
 
 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);
 }
 
 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);
   delegate_ = 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);
   test_runner_->Install(frame);
   GCController::Install(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() {
   ResetTestHelperControllers();
   test_runner_->Reset();
 }
 
 void TestInterfaces::SetTestIsRunning(bool running) {
   test_runner_->SetTestIsRunning(running);
 }
@@ skipping 45 matching lines @@
     NOTREACHED();
     return;
   }
   window_list_.erase(pos);
 }
 
 AccessibilityController* TestInterfaces::GetAccessibilityController() {
   return accessibility_controller_.get();
 }
 
-EventSender* TestInterfaces::GetEventSender() {
-  return event_sender_.get();
-}
-
 TestRunner* TestInterfaces::GetTestRunner() {
   return test_runner_.get();
 }
 
 WebTestDelegate* TestInterfaces::GetDelegate() {
   return delegate_;
 }
 
 const std::vector<WebTestProxyBase*>& TestInterfaces::GetWindowList() {
   return window_list_;
 }
 
 blink::WebThemeEngine* TestInterfaces::GetThemeEngine() {
   if (!test_runner_->UseMockTheme())
     return 0;
   if (!theme_engine_.get())
     theme_engine_.reset(new MockWebThemeEngine());
   return theme_engine_.get();
 }
 
 AppBannerClient* TestInterfaces::GetAppBannerClient() {
   return app_banner_client_;
 }
 
 }  // namespace test_runner