From a4e969f4965059196ca948db781e52f7cfebf19e Mon Sep 17 00:00:00 2001
From: Lorry Tar Creator <lorry-tar-importer@lorry>
Date: Tue, 24 May 2016 08:28:08 +0000
Subject: webkitgtk-2.12.3

---
 Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitSettings.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitSettings.cpp')

diff --git a/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitSettings.cpp b/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitSettings.cpp
index fb1091889..b3a377270 100644
--- a/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitSettings.cpp
+++ b/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitSettings.cpp
@@ -35,7 +35,7 @@
 #include "WebKitTestServer.h"
 #include <gtk/gtk.h>
 #include <webkit2/webkit2.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 
 static WebKitTestServer* gServer;
 
@@ -273,6 +273,11 @@ static void testWebKitSettings(Test*, gconstpointer)
     webkit_settings_set_enable_mediasource(settings, TRUE);
     g_assert(webkit_settings_get_enable_mediasource(settings));
 
+    // File access from file URLs is not allowed by default.
+    g_assert(!webkit_settings_get_allow_file_access_from_file_urls(settings));
+    webkit_settings_set_allow_file_access_from_file_urls(settings, TRUE);
+    g_assert(webkit_settings_get_allow_file_access_from_file_urls(settings));
+
     g_object_unref(G_OBJECT(settings));
 }
 
-- 
cgit v1.2.1