Merge remote-tracking branch 'origin/5.15' into dev

Conflicts:
	src/3rdparty
	src/core/certificate_error_controller.cpp
	src/core/certificate_error_controller.h
	src/core/compositor/compositor.cpp
	src/core/compositor/compositor.h
	src/core/compositor/display_gl_output_surface.cpp
	src/core/content_browser_client_qt.cpp
	src/core/core_chromium.pri
	src/core/delegated_frame_host_client_qt.cpp
	src/core/ozone/gl_share_context_qt.h
	src/core/ozone/surface_factory_qt.cpp
	src/core/permission_manager_qt.cpp
	src/core/render_widget_host_view_qt.cpp
	src/core/render_widget_host_view_qt.h
	src/core/web_engine_context.cpp
	src/core/web_engine_settings.cpp
	src/core/web_event_factory.cpp
	tests/auto/widgets/qwebenginedownloadrequest/tst_qwebenginedownloadrequest.cpp

Change-Id: Ice14c3c350b139e800c7c7011b7cef1fc7010669

1 files changed, 7 insertions, 0 deletions

diff --git a/src/core/browser_main_parts_qt.h b/src/core/browser_main_parts_qt.h
index f287c2e44..9d0967612 100644
--- a/src/core/browser_main_parts_qt.h
+++ b/src/core/browser_main_parts_qt.h
@@ -50,6 +50,11 @@ namespace content {
 class ServiceManagerConnection;
 }
 
+namespace performance_manager {
+class PerformanceManager;
+class PerformanceManagerRegistry;
+}
+
 namespace QtWebEngineCore {
 
 std::unique_ptr<base::MessagePump> messagePumpFactory();
@@ -69,6 +74,8 @@ public:
 
 private:
     DISALLOW_COPY_AND_ASSIGN(BrowserMainPartsQt);
+    std::unique_ptr<performance_manager::PerformanceManager> performance_manager_;
+    std::unique_ptr<performance_manager::PerformanceManagerRegistry> performance_manager_registry_;
 };
 
 } // namespace QtWebEngineCore