Switch the inheritance of WebView from WebWidget to protected.

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 18 matching lines @@
 #include "content/test/mock_webclipboard_impl.h"
 #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/WebPluginParams.h"
 #include "third_party/WebKit/public/web/WebView.h"
 #include "v8/include/v8.h"
 
 using blink::WebAudioDevice;
 using blink::WebClipboard;
+using blink::WebFrame;
 using blink::WebLocalFrame;
 using blink::WebMIDIAccessor;
 using blink::WebMIDIAccessorClient;
 using blink::WebMediaStreamCenter;
 using blink::WebMediaStreamCenterClient;
 using blink::WebPlugin;
 using blink::WebPluginParams;
 using blink::WebRTCPeerConnectionHandler;
 using blink::WebRTCPeerConnectionHandlerClient;
 using blink::WebThemeEngine;
@@ skipping 45 matching lines @@
 }
 
 void LayoutTestContentRendererClient::RenderThreadStarted() {
   ShellContentRendererClient::RenderThreadStarted();
   shell_observer_.reset(new LayoutTestRenderThreadObserver());
 }
 
 void LayoutTestContentRendererClient::RenderFrameCreated(
     RenderFrame* render_frame) {
   new LayoutTestRenderFrameObserver(render_frame);
+
+  test_runner::WebTestProxyBase* proxy =

[dcheng, 2016/05/03 09:27:13]

The ultimate goal here is to associate the widget with the test proxy for the
RenderFrame, right? Do you have a sense of how involved that would be? Would it
make sense to group that into this CL?

[Łukasz Anforowicz, 2016/05/03 16:09:55]

Would it make sense to pass web_local_frame->frameWidget() to
WebFrameTestProxyBase and store it there?  (because WebFrameTestProxyBase is for
frame-level things, and WebTestProxyBase is for view-level things [I need to
rename it to WebViewTestProxyBase one day]).

[lfg, 2016/05/03 21:19:43]

I think that does make sense, but there's also a lot more involved in fixing
this. All over the test runner there are assumptions of a single widget (and
that being the WebView).

I think we need to fix the test runner to make it aware of local roots and
WebFrameWidgets, similarly to what we have with the WebFrameTestClient and
WebViewTestClient, we should look into adding a WebWidgetTestClient that
forwards things to RenderWidget when a local root is not the WebView.

Overall, I think this should be done separately.

[dcheng, 2016/05/04 04:55:29]

OK. Might be worth adding a TODO, but I leave that to you.

[dcheng, 2016/05/04 04:55:29]

OK. Might be worth adding a TODO, but I leave that to you.

+      GetWebTestProxyBase(render_frame->GetRenderView());
+  WebLocalFrame* frame = render_frame->GetWebFrame();
+  if (!frame->parent())
+    proxy->set_web_widget(frame->frameWidget());
 }
 
 void LayoutTestContentRendererClient::RenderViewCreated(
     RenderView* render_view) {
   new ShellRenderViewObserver(render_view);
 
   test_runner::WebTestProxyBase* proxy = GetWebTestProxyBase(render_view);
-  proxy->set_web_widget(render_view->GetWebView());
   proxy->set_web_view(render_view->GetWebView());
   proxy->Reset();
   proxy->SetSendWheelGestures(UseGestureBasedWheelScrolling());
 
   BlinkTestRunner* test_runner = BlinkTestRunner::Get(render_view);
   test_runner->Reset(false /* for_new_test */);
 
   LayoutTestRenderThreadObserver::GetInstance()
       ->test_interfaces()
       ->TestRunner()
@@ skipping 64 matching lines @@
 LayoutTestContentRendererClient::CreateMediaStreamRendererFactory() {
 #if defined(ENABLE_WEBRTC)
   return std::unique_ptr<MediaStreamRendererFactory>(
       new TestMediaStreamRendererFactory());
 #else
   return nullptr;
 #endif
 }
 
 }  // namespace content