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

components/test_runner/event_sender.h

Index: components/test_runner/event_sender.h
diff --git a/components/test_runner/event_sender.h b/components/test_runner/event_sender.h
index 4cada6ccc47943b3dc13e60870760866bee3db84..156e745e1073155470cc16c81874170e04b32b43 100644
--- a/components/test_runner/event_sender.h
+++ b/components/test_runner/event_sender.h
@@ -26,6 +26,7 @@
 namespace blink {
 class WebLocalFrame;
 class WebView;
+class WebWidget;
 struct WebContextMenuData;
 }
 
@@ -36,8 +37,8 @@ class Arguments;
 namespace test_runner {
 
 class TestInterfaces;
+class WebWidgetTestProxyBase;
 class WebTestDelegate;
-class WebViewTestProxyBase;
 
 // Key event location code introduced in DOM Level 3.
 // See also: http://www.w3.org/TR/DOM-Level-3-Events/#events-keyboardevents
@@ -50,7 +51,7 @@ enum KeyLocationCode {
 
 class EventSender {
  public:
-  explicit EventSender(WebViewTestProxyBase*);
+  explicit EventSender(WebWidgetTestProxyBase*);
   virtual ~EventSender();
 
   void Reset();
@@ -200,12 +201,12 @@ class EventSender {
   void DoDragAfterMouseMove(const blink::WebMouseEvent&);
   void ReplaySavedEvents();
   blink::WebInputEventResult HandleInputEventOnViewOrPopup(
-      const blink::WebInputEvent&);
+      const blink::WebInputEvent& event);
 
   void SendGesturesForMouseWheelEvent(
       const blink::WebMouseWheelEvent wheel_event);
 
-  std::unique_ptr<blink::WebInputEvent> ScaleEvent(
+  std::unique_ptr<blink::WebInputEvent> TransformScreenToWidgetCoordinates(
       const blink::WebInputEvent& event);
 
   double last_event_timestamp() { return last_event_timestamp_; }
@@ -214,6 +215,7 @@ class EventSender {
   void set_force_layout_on_events(bool force) {
     force_layout_on_events_ = force;
   }
+  void DoLayoutIfForceLayoutOnEventsRequested();
 
   bool is_drag_mode() const { return is_drag_mode_; }
   void set_is_drag_mode(bool drag_mode) { is_drag_mode_ = drag_mode; }
@@ -257,11 +259,12 @@ class EventSender {
   int wm_sys_dead_char_;
 #endif
 
-  WebViewTestProxyBase* web_view_test_proxy_base_;
+  WebWidgetTestProxyBase* web_widget_test_proxy_base_;
   TestInterfaces* interfaces();
   WebTestDelegate* delegate();
   const blink::WebView* view() const;
   blink::WebView* view();
+  blink::WebWidget* widget();
 
   bool force_layout_on_events_;
 
@@ -280,7 +283,6 @@ class EventSender {
   // Location of the touch point that initiated a gesture.
   blink::WebPoint current_gesture_location_;
 
-
   // Mouse-like pointer properties.
   struct PointerState {
       // Last pressed button (Left/Right/Middle or None).