Use correct WebView from EventSender.

components/test_runner/event_sender.h

 // 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.
 
 #ifndef COMPONENTS_TEST_RUNNER_EVENT_SENDER_H_
 #define COMPONENTS_TEST_RUNNER_EVENT_SENDER_H_
 
 #include <stdint.h>
 
 #include <queue>
 #include <string>
 #include <unordered_map>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "build/build_config.h"
 #include "third_party/WebKit/public/platform/WebDragData.h"
 #include "third_party/WebKit/public/platform/WebDragOperation.h"
 #include "third_party/WebKit/public/platform/WebInputEventResult.h"
 #include "third_party/WebKit/public/platform/WebPoint.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 #include "third_party/WebKit/public/web/WebTouchPoint.h"
 
 namespace blink {
-class WebFrame;
+class WebLocalFrame;
 class WebView;
 struct WebContextMenuData;
 }
 
 namespace gin {
 class Arguments;
 }
 
 namespace test_runner {
 
 class TestInterfaces;
 class WebTestDelegate;
+class WebTestProxyBase;
 
 // Key event location code introduced in DOM Level 3.
 // See also: http://www.w3.org/TR/DOM-Level-3-Events/#events-keyboardevents
 enum KeyLocationCode {
   DOMKeyLocationStandard      = 0x00,
   DOMKeyLocationLeft          = 0x01,
   DOMKeyLocationRight         = 0x02,
   DOMKeyLocationNumpad        = 0x03
 };
 
-class EventSender : public base::SupportsWeakPtr<EventSender> {
+class EventSender {
  public:
-  explicit EventSender(TestInterfaces*);
+  explicit EventSender(WebTestProxyBase*);
   virtual ~EventSender();
 
   void Reset();
-  void Install(blink::WebFrame*);
-  void SetDelegate(WebTestDelegate*);
-  void SetWebView(blink::WebView*);
+  void Install(blink::WebLocalFrame*);
 
   void SetContextMenuData(const blink::WebContextMenuData&);
 
   void DoDragDrop(const blink::WebDragData&, blink::WebDragOperationsMask);
 
+  void set_send_wheel_gestures(bool send_wheel_gestures) {
+    send_wheel_gestures_ = send_wheel_gestures;
+  }
+
+ private:
+  friend class EventSenderBindings;
+
   void MouseDown(int button_number, int modifiers);
   void MouseUp(int button_number, int modifiers);
   void PointerDown(int button_number,
                    int modifiers,
                    blink::WebPointerProperties::PointerType,
                    int pointerId);
   void PointerUp(int button_number,
                  int modifiers,
                  blink::WebPointerProperties::PointerType,
                  int pointerId);
   void SetMouseButtonState(int button_number, int modifiers);
 
   void KeyDown(const std::string& code_str,
                int modifiers,
                KeyLocationCode location);
 
-  void set_send_wheel_gestures(bool send_wheel_gestures) {
-    send_wheel_gestures_ = send_wheel_gestures;
-  }
-
- private:
-  friend class EventSenderBindings;
-
   struct SavedEvent {
     enum SavedEventType {
       TYPE_UNSPECIFIED,
       TYPE_MOUSE_UP,
       TYPE_MOUSE_MOVE,
       TYPE_LEAP_FORWARD
     };
 
     SavedEvent();
 
@@ skipping 145 matching lines @@
   int wm_key_down_;
   int wm_key_up_;
   int wm_char_;
   int wm_dead_char_;
   int wm_sys_key_down_;
   int wm_sys_key_up_;
   int wm_sys_char_;
   int wm_sys_dead_char_;
 #endif
 
-  TestInterfaces* interfaces_;
-  WebTestDelegate* delegate_;
-  blink::WebView* view_;
+  WebTestProxyBase* web_test_proxy_base_;
+  TestInterfaces* interfaces();
+  WebTestDelegate* delegate();
+  const blink::WebView* view() const;
+  blink::WebView* view();
 
   bool send_wheel_gestures_;
   bool force_layout_on_events_;
 
   // When set to true (the default value), we batch mouse move and mouse up
   // events so we can simulate drag & drop.
   bool is_drag_mode_;
 
   int touch_modifiers_;
   bool touch_cancelable_;
@@ skipping 52 matching lines @@
   double last_event_timestamp_;
 
   base::WeakPtrFactory<EventSender> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(EventSender);
 };
 
 }  // namespace test_runner
 
 #endif  // COMPONENTS_TEST_RUNNER_EVENT_SENDER_H_