Switch the inheritance of WebViewClient from WebWidgetClient to protected.

third_party/WebKit/Source/web/tests/FrameTestHelpers.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 171 matching lines @@
     , m_webViewWidget(nullptr)
     , m_settingOverrider(settingOverrider)
 {
 }
 
 WebViewHelper::~WebViewHelper()
 {
     reset();
 }
 
-WebViewImpl* WebViewHelper::initializeWithOpener(WebFrame* opener, bool enableJavascript, TestWebFrameClient* webFrameClient, TestWebViewClient* webViewClient, void (*updateSettingsFunc)(WebSettings*))
+WebViewImpl* WebViewHelper::initializeWithOpener(WebFrame* opener, bool enableJavascript, TestWebFrameClient* webFrameClient, TestWebViewClient* webViewClient, TestWebWidgetClient* webWidgetClient, void (*updateSettingsFunc)(WebSettings*))
 {
     reset();
 
     if (!webFrameClient)
         webFrameClient = defaultWebFrameClient();
     if (!webViewClient)
         webViewClient = defaultWebViewClient();
+    if (!webWidgetClient)
+        webWidgetClient = webViewClient->widgetClient();
     m_webView = WebViewImpl::create(webViewClient);
     m_webView->settings()->setJavaScriptEnabled(enableJavascript);
     m_webView->settings()->setPluginsEnabled(true);
     // Enable (mocked) network loads of image URLs, as this simplifies
     // the completion of resource loads upon test shutdown & helps avoid
     // dormant loads trigger Resource leaks for image loads.
     //
     // Consequently, all external image resources must be mocked.
     m_webView->settings()->setLoadsImagesAutomatically(true);
     if (updateSettingsFunc)
         updateSettingsFunc(m_webView->settings());
     else
         m_webView->settings()->setDeviceSupportsMouse(false);
     if (m_settingOverrider)
         m_settingOverrider->overrideSettings(m_webView->settings());
     m_webView->setDeviceScaleFactor(webViewClient->screenInfo().deviceScaleFactor);
     m_webView->setDefaultPageScaleLimits(1, 4);
     WebLocalFrame* frame = WebLocalFrameImpl::create(WebTreeScopeType::Document, webFrameClient, opener);
     m_webView->setMainFrame(frame);
     // TODO(dcheng): The main frame widget currently has a special case.
     // Eliminate this once WebView is no longer a WebWidget.
-    m_webViewWidget = blink::WebFrameWidget::create(webViewClient, m_webView, frame);
+    m_webViewWidget = blink::WebFrameWidget::create(webWidgetClient, m_webView, frame);
 
     m_testWebViewClient = webViewClient;
 
     return m_webView;
 }
 
-WebViewImpl* WebViewHelper::initialize(bool enableJavascript, TestWebFrameClient* webFrameClient, TestWebViewClient* webViewClient, void (*updateSettingsFunc)(WebSettings*))
+WebViewImpl* WebViewHelper::initialize(bool enableJavascript, TestWebFrameClient* webFrameClient, TestWebViewClient* webViewClient, TestWebWidgetClient* webWidgetClient, void (*updateSettingsFunc)(WebSettings*))
 {
-    return initializeWithOpener(nullptr, enableJavascript, webFrameClient, webViewClient, updateSettingsFunc);
+    return initializeWithOpener(nullptr, enableJavascript, webFrameClient, webViewClient, webWidgetClient, updateSettingsFunc);
 }
 
-WebViewImpl* WebViewHelper::initializeAndLoad(const std::string& url, bool enableJavascript, TestWebFrameClient* webFrameClient, TestWebViewClient* webViewClient, void (*updateSettingsFunc)(WebSettings*))
+WebViewImpl* WebViewHelper::initializeAndLoad(const std::string& url, bool enableJavascript, TestWebFrameClient* webFrameClient, TestWebViewClient* webViewClient, TestWebWidgetClient* webWidgetClient, void (*updateSettingsFunc)(WebSettings*))
 {
-    initialize(enableJavascript, webFrameClient, webViewClient, updateSettingsFunc);
+    initialize(enableJavascript, webFrameClient, webViewClient, webWidgetClient, updateSettingsFunc);
 
     loadFrame(webView()->mainFrame(), url);
 
     return webViewImpl();
 }
 
 void WebViewHelper::reset()
 {
     if (m_webViewWidget) {
         m_webViewWidget->close();
@@ skipping 56 matching lines @@
     m_frame->close();
 }
 
 void TestWebViewClient::initializeLayerTreeView()
 {
     m_layerTreeView = adoptPtr(new WebLayerTreeViewImplForTesting);
 }
 
 } // namespace FrameTestHelpers
 } // namespace blink