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 63 matching lines @@
   }
 
   proxy->set_delegate(test_runner);
   proxy->set_view_test_client(LayoutTestRenderThreadObserver::GetInstance()
                                   ->test_interfaces()
                                   ->CreateWebViewTestClient(proxy));
   std::unique_ptr<test_runner::WebWidgetTestClient> widget_test_client =
       LayoutTestRenderThreadObserver::GetInstance()
           ->test_interfaces()
           ->CreateWebWidgetTestClient(proxy);
-  widget_test_client->set_web_view_test_proxy_base(proxy);
   proxy->set_widget_test_client(std::move(widget_test_client));
   proxy->SetInterfaces(interfaces);
 }
 
 void WebWidgetTestProxyCreated(blink::WebWidget* web_widget,
                                test_runner::WebWidgetTestProxyBase* proxy) {
   CHECK(web_widget->isWebFrameWidget());
   proxy->set_web_widget(web_widget);
   blink::WebFrameWidget* web_frame_widget =
       static_cast<blink::WebFrameWidget*>(web_widget);
   blink::WebView* web_view = web_frame_widget->localRoot()->view();
   RenderView* render_view = RenderView::FromWebView(web_view);
   test_runner::WebViewTestProxyBase* view_proxy =
       GetWebViewTestProxyBase(render_view);
   std::unique_ptr<test_runner::WebWidgetTestClient> widget_test_client =
       LayoutTestRenderThreadObserver::GetInstance()
           ->test_interfaces()
           ->CreateWebWidgetTestClient(proxy);
-  widget_test_client->set_web_view_test_proxy_base(view_proxy);
+  proxy->set_web_view_test_proxy_base(view_proxy);
   proxy->set_widget_test_client(std::move(widget_test_client));
 }
 
 void WebFrameTestProxyCreated(RenderFrame* render_frame,
                               test_runner::WebFrameTestProxyBase* proxy) {
   test_runner::WebViewTestProxyBase* web_view_test_proxy_base =
       GetWebViewTestProxyBase(render_frame->GetRenderView());
   proxy->set_test_client(
       LayoutTestRenderThreadObserver::GetInstance()
           ->test_interfaces()
@@ skipping 149 matching lines @@
           switches::kEnableFontAntialiasing)) {
     blink::setFontAntialiasingEnabledForTest(true);
   }
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kAlwaysUseComplexText)) {
     blink::setAlwaysUseComplexTextForTest(true);
   }
 }
 
 }  // namespace content