Making EventSender talk to the right WebWidget (for OOPIF support).

components/test_runner/web_view_test_proxy.cc

Index: components/test_runner/web_view_test_proxy.cc
diff --git a/components/test_runner/web_view_test_proxy.cc b/components/test_runner/web_view_test_proxy.cc
index 9de3f3e620a2c1832752cd5667f812516c5a875b..3059f2f514ba67964107d1541e55580cd7b638f7 100644
--- a/components/test_runner/web_view_test_proxy.cc
+++ b/components/test_runner/web_view_test_proxy.cc
@@ -8,8 +8,6 @@
 #include <stdint.h>
 
 #include "components/test_runner/accessibility_controller.h"
-#include "components/test_runner/event_sender.h"
-#include "components/test_runner/mock_screen_orientation_client.h"
 #include "components/test_runner/test_interfaces.h"
 #include "components/test_runner/test_runner.h"
 #include "components/test_runner/test_runner_for_specific_view.h"
@@ -17,6 +15,8 @@
 #include "components/test_runner/web_test_delegate.h"
 #include "components/test_runner/web_test_interfaces.h"
 #include "components/test_runner/web_widget_test_proxy.h"
+#include "third_party/WebKit/public/web/WebFrame.h"
+#include "third_party/WebKit/public/web/WebView.h"
 
 namespace test_runner {
 
@@ -25,9 +25,10 @@ WebViewTestProxyBase::WebViewTestProxyBase()
       delegate_(nullptr),
       web_view_(nullptr),
       accessibility_controller_(new AccessibilityController(this)),
-      event_sender_(new EventSender(this)),
       text_input_controller_(new TextInputController(this)),
-      view_test_runner_(new TestRunnerForSpecificView(this)) {}
+      view_test_runner_(new TestRunnerForSpecificView(this)) {
+  WebWidgetTestProxyBase::set_web_view_test_proxy_base(this);
+}
 
 WebViewTestProxyBase::~WebViewTestProxyBase() {
   test_interfaces_->WindowClosed(this);
@@ -40,14 +41,19 @@ void WebViewTestProxyBase::SetInterfaces(WebTestInterfaces* interfaces) {
 
 void WebViewTestProxyBase::Reset() {
   accessibility_controller_->Reset();
-  event_sender_->Reset();
   // text_input_controller_ doesn't have any state to reset.
   view_test_runner_->Reset();
+  WebWidgetTestProxyBase::Reset();
+
+  for (blink::WebFrame* frame = web_view_->mainFrame(); frame;
+       frame = frame->traverseNext(false)) {
+    if (frame->isWebLocalFrame())
+      delegate_->GetWebWidgetTestProxyBase(frame->toWebLocalFrame())->Reset();
+  }
 }
 
 void WebViewTestProxyBase::BindTo(blink::WebLocalFrame* frame) {
   accessibility_controller_->Install(frame);
-  event_sender_->Install(frame);
   text_input_controller_->Install(frame);
   view_test_runner_->Install(frame);
 }