1 files changed, 18 insertions, 17 deletions

diff --git a/src/core/renderer/content_renderer_client_qt.h b/src/core/renderer/content_renderer_client_qt.h
index 24a841cb8..a0faec531 100644
--- a/src/core/renderer/content_renderer_client_qt.h
+++ b/src/core/renderer/content_renderer_client_qt.h
@@ -47,12 +47,15 @@
 #include "ppapi/buildflags/buildflags.h"
 
 #if BUILDFLAG(ENABLE_PLUGINS)
-#include "qtwebengine/browser/plugin.mojom.h"
 #include "third_party/blink/public/web/web_plugin_params.h"
 #endif
 
 #include <QScopedPointer>
 
+namespace chrome {
+class WebRtcLoggingAgentImpl;
+}
+
 namespace error_page {
 class Error;
 }
@@ -75,8 +78,8 @@ struct WebPluginInfo;
 
 namespace QtWebEngineCore {
 
-class RenderThreadObserverQt;
-
+class UserResourceController;
+class RenderConfiguration;
 class ContentRendererClientQt
     : public content::ContentRendererClient
     , public service_manager::LocalInterfaceProvider
@@ -88,9 +91,7 @@ public:
     // content::ContentRendererClient:
     void RenderThreadStarted() override;
     void ExposeInterfacesToBrowser(mojo::BinderMap* binders) override;
-    void RenderViewCreated(content::RenderView *render_view) override;
     void RenderFrameCreated(content::RenderFrame *render_frame) override;
-    bool ShouldSuppressErrorPage(content::RenderFrame *, const GURL &) override;
     bool HasErrorPage(int http_status_code) override;
 
     void PrepareErrorPage(content::RenderFrame *render_frame,
@@ -111,14 +112,14 @@ public:
     void RunScriptsAtDocumentStart(content::RenderFrame *render_frame) override;
     void RunScriptsAtDocumentEnd(content::RenderFrame *render_frame) override;
     void RunScriptsAtDocumentIdle(content::RenderFrame *render_frame) override;
+    bool IsPluginHandledExternally(content::RenderFrame *embedder_frame,
+                                   const blink::WebElement &plugin_element,
+                                   const GURL &original_url,
+                                   const std::string &original_mime_type);
     bool OverrideCreatePlugin(content::RenderFrame *render_frame,
                               const blink::WebPluginParams &params,
                               blink::WebPlugin **plugin) override;
     bool IsOriginIsolatedPepperPlugin(const base::FilePath& plugin_path) override;
-    content::BrowserPluginDelegate *CreateBrowserPluginDelegate(content::RenderFrame *render_frame,
-                                                                const content::WebPluginInfo &info,
-                                                                const std::string &mime_type,
-                                                                const GURL &original_url) override;
 
     void WillSendRequest(blink::WebLocalFrame *frame,
                          ui::PageTransition transition_type,
@@ -128,15 +129,13 @@ public:
                          GURL *new_url,
                          bool *attach_same_site_cookies) override;
 
-    void BindReceiverOnMainThread(mojo::GenericPendingReceiver receiver) override;
     bool RequiresWebComponentsV0(const GURL &url) override;
 
-#if BUILDFLAG(ENABLE_PLUGINS)
-    static blink::WebPlugin* CreatePlugin(content::RenderFrame* render_frame,
-                                          const blink::WebPluginParams& params,
-                                          const chrome::mojom::PluginInfo& plugin_info);
+#if QT_CONFIG(webengine_webrtc) && QT_CONFIG(webengine_extensions)
+    chrome::WebRtcLoggingAgentImpl *GetWebRtcLoggingAgent();
 #endif
 
+
 private:
 #if BUILDFLAG(ENABLE_SPELLCHECK)
     void InitSpellCheck();
@@ -147,14 +146,16 @@ private:
     void GetNavigationErrorStringsInternal(content::RenderFrame *renderFrame, const std::string &httpMethod,
                                            const error_page::Error &error, std::string *errorHtml);
 
-    QScopedPointer<RenderThreadObserverQt> m_renderThreadObserver;
+    QScopedPointer<RenderConfiguration> m_renderConfiguration;
+    QScopedPointer<UserResourceController> m_userResourceController;
     QScopedPointer<visitedlink::VisitedLinkReader> m_visitedLinkReader;
     QScopedPointer<web_cache::WebCacheImpl> m_webCacheImpl;
 #if QT_CONFIG(webengine_spellchecker)
     QScopedPointer<SpellCheck> m_spellCheck;
 #endif
-
-    service_manager::BinderRegistry m_registry;
+#if QT_CONFIG(webengine_webrtc) && QT_CONFIG(webengine_extensions)
+    std::unique_ptr<chrome::WebRtcLoggingAgentImpl> m_webrtcLoggingAgentImpl;
+#endif
 
     DISALLOW_COPY_AND_ASSIGN(ContentRendererClientQt);
 };