Add WebWidgetTestProxy.

content/shell/renderer/layout_test/layout_test_content_renderer_client.cc

Index: content/shell/renderer/layout_test/layout_test_content_renderer_client.cc
diff --git a/content/shell/renderer/layout_test/layout_test_content_renderer_client.cc b/content/shell/renderer/layout_test/layout_test_content_renderer_client.cc
index ff84acfacde0f8630afd26ceac9d388018fba5b1..2463b3d8a892f8ac26833140e6973c838845c38e 100644
--- a/content/shell/renderer/layout_test/layout_test_content_renderer_client.cc
+++ b/content/shell/renderer/layout_test/layout_test_content_renderer_client.cc
@@ -29,6 +29,7 @@
 #include "ppapi/shared_impl/ppapi_switches.h"
 #include "third_party/WebKit/public/platform/WebMediaStreamCenter.h"
 #include "third_party/WebKit/public/platform/modules/app_banner/WebAppBannerClient.h"
+#include "third_party/WebKit/public/web/WebFrameWidget.h"
 #include "third_party/WebKit/public/web/WebPluginParams.h"
 #include "third_party/WebKit/public/web/WebTestingSupport.h"
 #include "third_party/WebKit/public/web/WebView.h"
@@ -72,12 +73,31 @@ void WebViewTestProxyCreated(RenderView* render_view,
   proxy->set_view_test_client(LayoutTestRenderThreadObserver::GetInstance()
                                   ->test_interfaces()
                                   ->CreateWebViewTestClient(proxy));
-  proxy->set_widget_test_client(LayoutTestRenderThreadObserver::GetInstance()
-                                    ->test_interfaces()
-                                    ->CreateWebWidgetTestClient(proxy));
+  auto 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));

[Łukasz Anforowicz, 2016/08/02 20:38:13]

For a moment I was confused seeing 1) the call above and 2) seeing removal of
WebViewTestProxyBase::set_widget_test_client method, before realizing that the
CL also 3) adds a WebWidgetTestProxyBase::set_widget_test_client method (which
gets inherited by WebViewTestProxyBase).

I am guessing this call will go away once RenderView does not inherit from
RenderWidget anymore.

[lfg, 2016/08/02 22:27:21]

That's right, yes, see my other comment, but basically it's because we want to
have a WebWidgetTestProxy in a RenderWidget that also happens to be a
RenderView. Hopefully it won't be long until we can remove this.

   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);
+  auto widget_test_client = LayoutTestRenderThreadObserver::GetInstance()
+                                ->test_interfaces()
+                                ->CreateWebWidgetTestClient(proxy);
+  widget_test_client->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 =
@@ -92,6 +112,7 @@ void WebFrameTestProxyCreated(RenderFrame* render_frame,
 
 LayoutTestContentRendererClient::LayoutTestContentRendererClient() {
   EnableWebTestProxyCreation(base::Bind(&WebViewTestProxyCreated),
+                             base::Bind(&WebWidgetTestProxyCreated),
                              base::Bind(&WebFrameTestProxyCreated));
 }