Remove CefBrowserSettings related to file URL access (fixes issue #2820)

This removes CefBrowserSettings.universal_access_from_file_urls and
CefBrowserSettings.file_access_from_file_urls. Due to NetworkService
requirements these values must now be configured globally via command-line
flags ("allow-universal-access-from-files" and "allow-file-access-from-files"
respectively).

Also remove the kAllowFileAccessFromFileUrls switch in CEF which duplicates
the existing kAllowFileAccessFromFiles switch in Chromium (see issue #1785).

include/cef_api_hash.h

@@ -42,13 +42,13 @@
 // way that may cause binary incompatibility with other builds. The universal
 // hash value will change if any platform is affected whereas the platform hash
 // values will change only if that particular platform is affected.
-#define CEF_API_HASH_UNIVERSAL "d158dd50a51d3338248731969e8154e92abda022"
+#define CEF_API_HASH_UNIVERSAL "e73c0d9d941ac8976074cdbe19e7e0b3acc2760e"
 #if defined(OS_WIN)
-#define CEF_API_HASH_PLATFORM "657f400c514c841adc27fb29142d5ad4806e1db5"
+#define CEF_API_HASH_PLATFORM "89b87efd9b49e2a5c662445c054f199e751f1aaa"
 #elif defined(OS_MAC)
-#define CEF_API_HASH_PLATFORM "6e88cf614e9c742b0b50b25e6cf4a22afec3aae5"
+#define CEF_API_HASH_PLATFORM "9c8b78a5a20443625c1e4be8e2ca106be3e741d7"
 #elif defined(OS_LINUX)
-#define CEF_API_HASH_PLATFORM "5a8b9f7961b2ebf85c5fed71eccfeb2c858c9a5a"
+#define CEF_API_HASH_PLATFORM "83056bb4a1d078cf7847a5d2ab10435e598e788d"
 #endif
 
 #ifdef __cplusplus

include/internal/cef_types.h

@@ -603,18 +603,6 @@ typedef struct _cef_browser_settings_t {
   ///
   cef_state_t plugins;
 
-  ///
-  // Controls whether file URLs will have access to all URLs. Also configurable
-  // using the "allow-universal-access-from-files" command-line switch.
-  ///
-  cef_state_t universal_access_from_file_urls;
-
-  ///
-  // Controls whether file URLs will have access to other file URLs. Also
-  // configurable using the "allow-file-access-from-files" command-line switch.
-  ///
-  cef_state_t file_access_from_file_urls;
-
   ///
   // Controls whether image URLs will be loaded from the network. A cached image
   // will still be rendered if requested. Also configurable using the

include/internal/cef_types_wrappers.h

@@ -707,9 +707,6 @@ struct CefBrowserSettingsTraits {
     target->javascript_access_clipboard = src->javascript_access_clipboard;
     target->javascript_dom_paste = src->javascript_dom_paste;
     target->plugins = src->plugins;
-    target->universal_access_from_file_urls =
-        src->universal_access_from_file_urls;
-    target->file_access_from_file_urls = src->file_access_from_file_urls;
     target->image_loading = src->image_loading;
     target->image_shrink_standalone_to_fit =
         src->image_shrink_standalone_to_fit;

libcef/browser/prefs/renderer_prefs.cc

@@ -261,8 +261,6 @@ void SetDefaultPrefs(blink::web_pref::WebPreferences& web) {
       !command_line->HasSwitch(switches::kDisableJavascriptAccessClipboard);
   web.allow_universal_access_from_file_urls =
       command_line->HasSwitch(switches::kAllowUniversalAccessFromFileUrls);
-  web.allow_file_access_from_file_urls =
-      command_line->HasSwitch(switches::kAllowFileAccessFromFileUrls);
   web.shrinks_standalone_images_to_fit =
       command_line->HasSwitch(switches::kImageShrinkStandaloneToFit);
   web.text_areas_are_resizable =
@@ -323,10 +321,6 @@ void SetCefPrefs(const CefBrowserSettings& cef,
             web.javascript_can_access_clipboard);
   SET_STATE(cef.javascript_dom_paste, web.dom_paste_enabled);
   SET_STATE(cef.plugins, web.plugins_enabled);
-  SET_STATE(cef.universal_access_from_file_urls,
-            web.allow_universal_access_from_file_urls);
-  SET_STATE(cef.file_access_from_file_urls,
-            web.allow_file_access_from_file_urls);
   SET_STATE(cef.image_loading, web.loads_images_automatically);
   SET_STATE(cef.image_shrink_standalone_to_fit,
             web.shrinks_standalone_images_to_fit);

libcef/common/cef_switches.cc

@@ -48,9 +48,6 @@ const char kDisableJavascriptDomPaste[] = "disable-javascript-dom-paste";
 const char kAllowUniversalAccessFromFileUrls[] =
     "allow-universal-access-from-files";
 
-// Allow access from file URLs.
-const char kAllowFileAccessFromFileUrls[] = "allow-file-access-from-files";
-
 // Disable loading of images from the network. A cached image will still be
 // rendered if requested.
 const char kDisableImageLoading[] = "disable-image-loading";

libcef/common/cef_switches.h

@@ -29,7 +29,6 @@ extern const char kDisableJavascriptCloseWindows[];
 extern const char kDisableJavascriptAccessClipboard[];
 extern const char kDisableJavascriptDomPaste[];
 extern const char kAllowUniversalAccessFromFileUrls[];
-extern const char kAllowFileAccessFromFileUrls[];
 extern const char kDisableImageLoading[];
 extern const char kImageShrinkStandaloneToFit[];
 extern const char kDisableTextAreaResize[];