1 files changed, 8 insertions, 6 deletions
diff --git a/chromium/chrome/browser/resources/settings/site_settings/site_details.js b/chromium/chrome/browser/resources/settings/site_settings/site_details.js
index 875533a5f19..df765e0e3af 100644
--- a/chromium/chrome/browser/resources/settings/site_settings/site_details.js
+++ b/chromium/chrome/browser/resources/settings/site_settings/site_details.js
@@ -63,19 +63,19 @@ Polymer({
     },
 
     /** @private */
-    enableBluetoothScanningContentSetting_: {
+    enableNativeFileSystemWriteContentSetting_: {
       type: Boolean,
       value: function() {
-        return loadTimeData.getBoolean('enableBluetoothScanningContentSetting');
+        return loadTimeData.getBoolean(
+            'enableNativeFileSystemWriteContentSetting');
       }
     },
 
     /** @private */
-    enableNativeFileSystemWriteContentSetting_: {
+    enableInsecureContentContentSetting_: {
       type: Boolean,
       value: function() {
-        return loadTimeData.getBoolean(
-            'enableNativeFileSystemWriteContentSetting');
+        return loadTimeData.getBoolean('enableInsecureContentContentSetting');
       }
     },
   },
@@ -185,7 +185,9 @@ Polymer({
           exceptionList.forEach((exception, i) => {
             // |exceptionList| should be in the same order as
             // |categoryList|.
-            permissionsMap[categoryList[i]].site = exception;
+            if (permissionsMap[categoryList[i]]) {
+              permissionsMap[categoryList[i]].site = exception;
+            }
           });
 
           // The displayName won't change, so just use the first