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

content/shell/renderer/layout_test/layout_test_content_renderer_client.cc

 // Copyright (c) 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.
 
 #include "content/shell/renderer/layout_test/layout_test_content_renderer_client.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
 #include "components/test_runner/mock_credential_manager_client.h"
@@ skipping 65 matching lines @@
   proxy->set_widget_test_client(LayoutTestRenderThreadObserver::GetInstance()
                                     ->test_interfaces()
                                     ->CreateWebWidgetTestClient(proxy));
   proxy->SetInterfaces(interfaces);
 }
 
 void WebFrameTestProxyCreated(RenderFrame* render_frame,
                               test_runner::WebFrameTestProxyBase* proxy) {
   test_runner::WebTestProxyBase* web_test_proxy_base =
       GetWebTestProxyBase(render_frame->GetRenderView());
+  proxy->set_web_test_proxy_base(web_test_proxy_base);
   proxy->set_test_client(
       LayoutTestRenderThreadObserver::GetInstance()
           ->test_interfaces()
           ->CreateWebFrameTestClient(web_test_proxy_base, proxy));
 }
 
 }  // namespace
 
 LayoutTestContentRendererClient::LayoutTestContentRendererClient() {
   EnableWebTestProxyCreation(base::Bind(&WebTestProxyCreated),
                              base::Bind(&WebFrameTestProxyCreated));
 }
 
 LayoutTestContentRendererClient::~LayoutTestContentRendererClient() {
 }
 
 void LayoutTestContentRendererClient::RenderThreadStarted() {
   ShellContentRendererClient::RenderThreadStarted();
   shell_observer_.reset(new LayoutTestRenderThreadObserver());
 }
 
 void LayoutTestContentRendererClient::RenderFrameCreated(
     RenderFrame* render_frame) {
   test_runner::WebFrameTestProxyBase* frame_proxy =
       GetWebFrameTestProxyBase(render_frame);
   frame_proxy->set_web_frame(render_frame->GetWebFrame());
+  frame_proxy->SetSendWheelGestures(UseGestureBasedWheelScrolling());
   new LayoutTestRenderFrameObserver(render_frame);
 }
 
 void LayoutTestContentRendererClient::RenderViewCreated(
     RenderView* render_view) {
   new ShellRenderViewObserver(render_view);
 
   test_runner::WebTestProxyBase* proxy = GetWebTestProxyBase(render_view);
   proxy->set_web_view(render_view->GetWebView());
   // TODO(lfg): We should fix the TestProxy to track the WebWidgets on every
   // local root in WebFrameTestProxy instead of having only the WebWidget for
   // the main frame in WebTestProxy.
   proxy->set_web_widget(render_view->GetWebView()->widget());
   proxy->Reset();
-  proxy->SetSendWheelGestures(UseGestureBasedWheelScrolling());
 
   BlinkTestRunner* test_runner = BlinkTestRunner::Get(render_view);
   test_runner->Reset(false /* for_new_test */);
 
   LayoutTestRenderThreadObserver::GetInstance()
       ->test_interfaces()
       ->TestRunner()
       ->InitializeWebViewWithMocks(render_view->GetWebView());
 }
 
@@ skipping 66 matching lines @@
   return nullptr;
 #endif
 }
 
 void LayoutTestContentRendererClient::DidInitializeWorkerContextOnWorkerThread(
     v8::Local<v8::Context> context) {
   blink::WebTestingSupport::injectInternalsObject(context);
 }
 
 }  // namespace content