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

components/test_runner/web_view_test_proxy.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_WEB_VIEW_TEST_PROXY_H_
 #define COMPONENTS_TEST_RUNNER_WEB_VIEW_TEST_PROXY_H_
 
 #include <memory>
 #include <string>
 #include <utility>
@@ skipping 26 matching lines @@
 class WebView;
 class WebWidget;
 struct WebFileChooserParams;
 struct WebPoint;
 struct WebWindowFeatures;
 }
 
 namespace test_runner {
 
 class AccessibilityController;
-class EventSender;
 class TestInterfaces;
 class TestRunnerForSpecificView;
 class TextInputController;
 class WebTestDelegate;
 class WebTestInterfaces;
 
 // WebViewTestProxyBase is the "brain" of WebViewTestProxy in the sense that
 // WebViewTestProxy does the bridge between RenderViewImpl and
 // WebViewTestProxyBase and when it requires a behavior to be different from the
 // usual, it will call WebViewTestProxyBase that implements the expected
 // behavior. See WebViewTestProxy class comments for more information.
 class TEST_RUNNER_EXPORT WebViewTestProxyBase : public WebWidgetTestProxyBase {
  public:
+  WebWidgetTestProxyBase::Subtype subtype() override;
+
   blink::WebView* web_view() { return web_view_; }
   void set_web_view(blink::WebView* view) {
     DCHECK(view);
     DCHECK(!web_view_);
     web_view_ = view;
   }
 
   void set_view_test_client(
       std::unique_ptr<WebViewTestClient> view_test_client) {
     DCHECK(view_test_client);
     DCHECK(!view_test_client_);
     view_test_client_ = std::move(view_test_client);
   }
 
   WebTestDelegate* delegate() { return delegate_; }
   void set_delegate(WebTestDelegate* delegate) {
     DCHECK(delegate);
     DCHECK(!delegate_);
     delegate_ = delegate;
   }
 
   TestInterfaces* test_interfaces() { return test_interfaces_; }
   void SetInterfaces(WebTestInterfaces* web_test_interfaces);
 
-  EventSender* event_sender() { return event_sender_.get(); }
-
   AccessibilityController* accessibility_controller() {
     return accessibility_controller_.get();
   }
 
   TestRunnerForSpecificView* view_test_runner() {
     return view_test_runner_.get();
   }
 
   void Reset();
   void BindTo(blink::WebLocalFrame* frame);
 
   void GetScreenOrientationForTesting(blink::WebScreenInfo&);
 
  protected:
   WebViewTestProxyBase();
   ~WebViewTestProxyBase();
 
   blink::WebViewClient* view_test_client() { return view_test_client_.get(); }
 
  private:
   TestInterfaces* test_interfaces_;
   WebTestDelegate* delegate_;
   blink::WebView* web_view_;
   blink::WebWidget* web_widget_;
   std::unique_ptr<WebViewTestClient> view_test_client_;
   std::unique_ptr<AccessibilityController> accessibility_controller_;
-  std::unique_ptr<EventSender> event_sender_;
   std::unique_ptr<TextInputController> text_input_controller_;
   std::unique_ptr<TestRunnerForSpecificView> view_test_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(WebViewTestProxyBase);
 };
 
 // WebViewTestProxy is used during LayoutTests and always instantiated, at time
 // of writing with Base=RenderViewImpl. It does not directly inherit from it for
 // layering purposes.
 // The intent of that class is to wrap RenderViewImpl for tests purposes in
@@ skipping 106 matching lines @@
 
  private:
   virtual ~WebViewTestProxy() {}
 
   DISALLOW_COPY_AND_ASSIGN(WebViewTestProxy);
 };
 
 }  // namespace test_runner
 
 #endif  // COMPONENTS_TEST_RUNNER_WEB_VIEW_TEST_PROXY_H_