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

components/test_runner/web_frame_test_proxy.h

Index: components/test_runner/web_frame_test_proxy.h
diff --git a/components/test_runner/web_frame_test_proxy.h b/components/test_runner/web_frame_test_proxy.h
index 83224b9c8d93ba5ef9a25bf6db6d42a5a4d172b4..5d14b1b69a49e6ceeb8abf48c8b8fe7041ef8adc 100644
--- a/components/test_runner/web_frame_test_proxy.h
+++ b/components/test_runner/web_frame_test_proxy.h
@@ -18,6 +18,9 @@
 
 namespace test_runner {
 
+class EventSender;
+class WebTestProxyBase;
+
 class TEST_RUNNER_EXPORT WebFrameTestProxyBase {
  public:
   void set_test_client(std::unique_ptr<WebFrameTestClient> client) {
@@ -33,14 +36,29 @@ class TEST_RUNNER_EXPORT WebFrameTestProxyBase {
     web_frame_ = frame;
   }
 
+  WebTestProxyBase* web_test_proxy_base() const { return web_test_proxy_base_; }
+  void set_web_test_proxy_base(WebTestProxyBase* web_test_proxy_base) {
+    DCHECK(web_test_proxy_base);
+    DCHECK(!web_test_proxy_base_);
+    web_test_proxy_base_ = web_test_proxy_base;
+  }
+
+  EventSender* event_sender() { return event_sender_.get(); }
+  void SetSendWheelGestures(bool send_gestures);
+
+  void Reset();  // DO NOT SUBMIT - not called anywhere... :-/
+  void BindTo(blink::WebLocalFrame* frame);
+
  protected:
   WebFrameTestProxyBase();
   ~WebFrameTestProxyBase();
   blink::WebFrameClient* test_client() { return test_client_.get(); }
 
  private:
-  std::unique_ptr<WebFrameTestClient> test_client_;
   blink::WebLocalFrame* web_frame_;
+  WebTestProxyBase* web_test_proxy_base_;
+  std::unique_ptr<WebFrameTestClient> test_client_;
+  std::unique_ptr<EventSender> event_sender_;
 
   DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxyBase);
 };