Merge branch 'pregmod-master' into 'pregmod-master'

Update FCHost to build with newer versions of CEF

See merge request pregmodfan/fc-pregmod!6644

FCHost/fchost/fchost_handler.cc

@@ -10,6 +10,7 @@
 
 #include "include/base/cef_bind.h"
 #include "include/cef_app.h"
+#include "include/cef_parser.h"
 #include "include/views/cef_browser_view.h"
 #include "include/views/cef_window.h"
 #include "include/wrapper/cef_closure_task.h"
@@ -19,6 +20,13 @@ namespace {
 
 FCHostHandler* g_instance = NULL;
 
+// Returns a data: URI with the specified contents.
+std::string GetDataURI(const std::string& data, const std::string& mime_type) {
+    return "data:" + mime_type + ";base64," +
+        CefURIEncode(CefBase64Encode(data.data(), data.size()), false)
+        .ToString();
+}
+
 }  // namespace
 
 FCHostHandler::FCHostHandler(bool use_views)
@@ -142,7 +150,8 @@ void FCHostHandler::OnLoadError(CefRefPtr<CefBrowser> browser,
         "<h2>Failed to load URL "
      << std::string(failedUrl) << " with error " << std::string(errorText)
      << " (" << errorCode << ").</h2></body></html>";
-  frame->LoadString(ss.str(), failedUrl);
+
+  frame->LoadURL(GetDataURI(ss.str(), "text/html"));
 }
 
 void FCHostHandler::OnBeforeDownload(CefRefPtr<CefBrowser> browser,