Adaptations for Chromium 85

Change-Id: I33c1af7c431055d95e0fb540246765cce684de15
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>

1 files changed, 18 insertions, 0 deletions

diff --git a/src/core/type_conversion.h b/src/core/type_conversion.h
index 83a499284..f09fd3fa3 100644
--- a/src/core/type_conversion.h
+++ b/src/core/type_conversion.h
@@ -86,6 +86,17 @@ inline QString toQt(const base::string16 &string)
 #endif
 }
 
+inline QString toQt(const base::Optional<base::string16> &string)
+{
+    if (!string.has_value())
+        return QString();
+#if defined(OS_WIN)
+    return QString::fromStdWString(string->data());
+#else
+    return QString::fromUtf16(string->data());
+#endif
+}
+
 inline QString toQString(const std::string &string)
 {
     return QString::fromStdString(string);
@@ -116,6 +127,13 @@ inline base::NullableString16 toNullableString16(const QString &qString)
     return base::NullableString16(toString16(qString), qString.isNull());
 }
 
+inline base::Optional<base::string16> toOptionalString16(const QString &qString)
+{
+    if (qString.isNull())
+        return base::nullopt;
+    return base::make_optional(toString16(qString));
+}
+
 inline QUrl toQt(const GURL &url)
 {
     if (url.is_valid())