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

components/test_runner/web_widget_test_client.h

Index: components/test_runner/web_widget_test_client.h
diff --git a/components/test_runner/web_widget_test_client.h b/components/test_runner/web_widget_test_client.h
index 15113909abe7bb9a81386e56a1074380c695af83..209771260066fbe69af3a4215b471cf2ed6d0539 100644
--- a/components/test_runner/web_widget_test_client.h
+++ b/components/test_runner/web_widget_test_client.h
@@ -16,6 +16,7 @@ class WebWidget;
 namespace test_runner {
 
 class TestRunner;
+class TestRunnerForSpecificView;
 class WebTestDelegate;
 class WebViewTestProxyBase;
 class WebWidgetTestProxyBase;
@@ -29,16 +30,10 @@ class WebWidgetTestClient : public blink::WebWidgetClient {
  public:
   // Caller has to ensure that all arguments (i.e. |test_runner| and |delegate|)
   // live longer than |this|.
-  WebWidgetTestClient(TestRunner* test_runner,
-                      WebWidgetTestProxyBase* web_widget_test_proxy_base);
+  WebWidgetTestClient(WebWidgetTestProxyBase* web_widget_test_proxy_base);
 
   virtual ~WebWidgetTestClient();
 
-  void set_web_view_test_proxy_base(
-      WebViewTestProxyBase* web_view_test_proxy_base) {
-    web_view_test_proxy_base_ = web_view_test_proxy_base;
-  }
-
   // WebWidgetClient overrides needed by WebViewTestProxy.
   blink::WebScreenInfo screenInfo() override;
   void scheduleAnimation() override;
@@ -52,9 +47,11 @@ class WebWidgetTestClient : public blink::WebWidgetClient {
  private:
   void AnimateNow();
 
-  // Borrowed pointers to other parts of Layout Tests state.
-  TestRunner* test_runner_;
-  WebViewTestProxyBase* web_view_test_proxy_base_;
+  WebTestDelegate* delegate();
+  TestRunnerForSpecificView* view_test_runner();
+  TestRunner* test_runner();
+
+  // Borrowed pointer to WebWidgetTestProxyBase.
   WebWidgetTestProxyBase* web_widget_test_proxy_base_;
 
   bool animation_scheduled_;