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

components/test_runner/web_widget_test_proxy.h

Index: components/test_runner/web_widget_test_proxy.h
diff --git a/components/test_runner/web_widget_test_proxy.h b/components/test_runner/web_widget_test_proxy.h
index 00bdbb7571fe756dc2a825a00449655df8de09e5..1734f7a0dfe22da7578cfe9a1599a663bb047a29 100644
--- a/components/test_runner/web_widget_test_proxy.h
+++ b/components/test_runner/web_widget_test_proxy.h
@@ -14,14 +14,24 @@
 #include "third_party/WebKit/public/web/WebWidgetClient.h"
 
 namespace blink {
+class WebLocalFrame;
 class WebString;
 class WebWidget;
 }
 
 namespace test_runner {
 
+class EventSender;
+class WebViewTestProxyBase;
+
 class TEST_RUNNER_EXPORT WebWidgetTestProxyBase {
  public:
+  enum class Subtype {
+    WebViewTestProxy,
+    WebWidgetTestProxy,
+  };
+  virtual Subtype subtype();
+
   blink::WebWidget* web_widget() { return web_widget_; }
   void set_web_widget(blink::WebWidget* widget) {
     DCHECK(widget);
@@ -36,6 +46,21 @@ class TEST_RUNNER_EXPORT WebWidgetTestProxyBase {
     widget_test_client_ = std::move(widget_test_client);
   }
 
+  WebViewTestProxyBase* web_view_test_proxy_base() const {
+    return web_view_test_proxy_base_;
+  }
+  void set_web_view_test_proxy_base(
+      WebViewTestProxyBase* web_view_test_proxy_base) {
+    DCHECK(web_view_test_proxy_base);
+    DCHECK(!web_view_test_proxy_base_);
+    web_view_test_proxy_base_ = web_view_test_proxy_base;
+  }
+
+  EventSender* event_sender() { return event_sender_.get(); }
+
+  void Reset();
+  void BindTo(blink::WebLocalFrame* frame);
+
  protected:
   WebWidgetTestProxyBase();
   ~WebWidgetTestProxyBase();
@@ -46,7 +71,9 @@ class TEST_RUNNER_EXPORT WebWidgetTestProxyBase {
 
  private:
   blink::WebWidget* web_widget_;
+  WebViewTestProxyBase* web_view_test_proxy_base_;
   std::unique_ptr<WebWidgetTestClient> widget_test_client_;
+  std::unique_ptr<EventSender> event_sender_;
 
   DISALLOW_COPY_AND_ASSIGN(WebWidgetTestProxyBase);
 };