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

Conflicts:
	src/core/api/qtbug-60565.cpp

Change-Id: Iaad05aa248fb57a69033013161e10e3acddd48f6

1 files changed, 3 insertions, 3 deletions

diff --git a/src/core/chromium_overrides.cpp b/src/core/chromium_overrides.cpp
index 4920540a0..9d3e3f08a 100644
--- a/src/core/chromium_overrides.cpp
+++ b/src/core/chromium_overrides.cpp
@@ -118,7 +118,7 @@ std::unique_ptr<base::ListValue> GetFontList_SlowBlocking()
         // TODO(yusukes): Support localized family names.
         font_list->Append(std::move(font_item));
     }
-    return std::move(font_list);
+    return font_list;
 }
 
 } // namespace content
@@ -142,8 +142,8 @@ namespace content {
 std::vector<AccessibilityTreeFormatter::TestPass> AccessibilityTreeFormatter::GetTestPasses()
 {
     return {
-        {"blink", &AccessibilityTreeFormatterBlink::CreateBlink},
-        {"native", &AccessibilityTreeFormatter::Create},
+        {"blink", &AccessibilityTreeFormatterBlink::CreateBlink, nullptr},
+        {"native", &AccessibilityTreeFormatter::Create, nullptr},
     };
 }
 } // namespace content