BASELINE: Update Chromium to 65.0.3525.40

Also imports missing submodules

Change-Id: I36901b7c6a325cda3d2c10cedb2186c25af3b79b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

21 files changed, 154 insertions, 153 deletions

diff --git a/chromium/chrome/browser/resources/settings/site_settings/all_sites.js b/chromium/chrome/browser/resources/settings/site_settings/all_sites.js
index 23f37fd1441..1c18d1981ac 100644
--- a/chromium/chrome/browser/resources/settings/site_settings/all_sites.js
+++ b/chromium/chrome/browser/resources/settings/site_settings/all_sites.js
@@ -41,11 +41,11 @@ Polymer({
    */
   getAllSitesList_: function() {
     /** @type {!Array<!RawSiteException>} */
-    var promiseList = [];
+    const promiseList = [];
 
-    var types = Object.values(settings.ContentSettingsTypes);
-    for (var i = 0; i < types.length; i++) {
-      var type = types[i];
+    const types = Object.values(settings.ContentSettingsTypes);
+    for (let i = 0; i < types.length; i++) {
+      const type = types[i];
       // <if expr="not chromeos">
       if (type == settings.ContentSettingsTypes.PROTECTED_CONTENT)
         continue;
@@ -86,10 +86,10 @@ Polymer({
    * @private
    */
   processExceptions_: function(data) {
-    var sites = /** @type {!Array<!RawSiteException>} */ ([]);
-    for (var i = 0; i < data.length; ++i) {
-      var exceptionList = data[i];
-      for (var k = 0; k < exceptionList.length; ++k) {
+    const sites = /** @type {!Array<!RawSiteException>} */ ([]);
+    for (let i = 0; i < data.length; ++i) {
+      const exceptionList = data[i];
+      for (let k = 0; k < exceptionList.length; ++k) {
         sites.push(exceptionList[k]);
       }
     }
@@ -107,19 +107,19 @@ Polymer({
    * @private
    */
   toSiteArray_: function(sites) {
-    var self = this;
+    const self = this;
     sites.sort(function(a, b) {
-      var url1 = self.toUrl(a.origin);
-      var url2 = self.toUrl(b.origin);
-      var comparison = url1.host.localeCompare(url2.host);
+      const url1 = self.toUrl(a.origin);
+      const url2 = self.toUrl(b.origin);
+      let comparison = url1.host.localeCompare(url2.host);
       if (comparison == 0) {
         comparison = url1.protocol.localeCompare(url2.protocol);
         if (comparison == 0) {
           comparison = url1.port.localeCompare(url2.port);
           if (comparison == 0) {
             // Compare hosts for the embedding origins.
-            var host1 = self.toUrl(a.embeddingOrigin);
-            var host2 = self.toUrl(b.embeddingOrigin);
+            let host1 = self.toUrl(a.embeddingOrigin);
+            let host2 = self.toUrl(b.embeddingOrigin);
             host1 = (host1 == null) ? '' : host1.host;
             host2 = (host2 == null) ? '' : host2.host;
             return host1.localeCompare(host2);
@@ -128,17 +128,17 @@ Polymer({
       }
       return comparison;
     });
-    var results = /** @type {!Array<!SiteException>} */ ([]);
-    var lastOrigin = '';
-    var lastEmbeddingOrigin = '';
-    for (var i = 0; i < sites.length; ++i) {
+    const results = /** @type {!Array<!SiteException>} */ ([]);
+    let lastOrigin = '';
+    let lastEmbeddingOrigin = '';
+    for (let i = 0; i < sites.length; ++i) {
       // Remove duplicates.
       if (sites[i].origin == lastOrigin &&
           sites[i].embeddingOrigin == lastEmbeddingOrigin) {
         continue;
       }
       /** @type {!SiteException} */
-      var siteException = this.expandSiteException(sites[i]);
+      const siteException = this.expandSiteException(sites[i]);
       results.push(siteException);
       lastOrigin = siteException.origin;
       lastEmbeddingOrigin = siteException.embeddingOrigin;
diff --git a/chromium/chrome/browser/resources/settings/site_settings/category_default_setting.js b/chromium/chrome/browser/resources/settings/site_settings/category_default_setting.js
index a73e3303987..220b76dad6f 100644
--- a/chromium/chrome/browser/resources/settings/site_settings/category_default_setting.js
+++ b/chromium/chrome/browser/resources/settings/site_settings/category_default_setting.js
@@ -123,7 +123,7 @@ Polymer({
       case settings.ContentSettingsTypes.COOKIES:
         // This category is tri-state: "Allow", "Block", "Keep data until
         // browser quits".
-        var value = settings.ContentSetting.BLOCK;
+        let value = settings.ContentSetting.BLOCK;
         if (this.categoryEnabled) {
           value = this.subControlParams_.value ?
               settings.ContentSetting.SESSION_ONLY :
@@ -156,7 +156,7 @@ Polymer({
     }
     this.priorDefaultContentSetting_ = update;
 
-    var basePref = {
+    const basePref = {
       'key': 'controlParams',
       'type': chrome.settingsPrivate.PrefType.BOOLEAN,
     };
@@ -169,13 +169,14 @@ Polymer({
           chrome.settingsPrivate.ControlledBy.USER_POLICY;
     }
 
-    var prefValue = this.computeIsSettingEnabled(update.setting);
+    const prefValue = this.computeIsSettingEnabled(update.setting);
     // The controlParams_ must be replaced (rather than just value changes) so
     // that observers will be notified of the change.
     this.controlParams_ = /** @type {chrome.settingsPrivate.PrefObject} */ (
         Object.assign({'value': prefValue}, basePref));
 
-    var subPrefValue = this.category == settings.ContentSettingsTypes.COOKIES &&
+    const subPrefValue =
+        this.category == settings.ContentSettingsTypes.COOKIES &&
         update.setting == settings.ContentSetting.SESSION_ONLY;
     // The subControlParams_ must be replaced (rather than just value changes)
     // so that observers will be notified of the change.
@@ -192,7 +193,7 @@ Polymer({
         .then(defaultValue => {
           this.updateControlParams_(defaultValue);
 
-          var categoryEnabled =
+          const categoryEnabled =
               this.computeIsSettingEnabled(defaultValue.setting);
           this.optionLabel_ =
               categoryEnabled ? this.toggleOnLabel : this.toggleOffLabel;
diff --git a/chromium/chrome/browser/resources/settings/site_settings/compiled_resources2.gyp b/chromium/chrome/browser/resources/settings/site_settings/compiled_resources2.gyp
index 952595bdf69..38e5e6cef5f 100644
--- a/chromium/chrome/browser/resources/settings/site_settings/compiled_resources2.gyp
+++ b/chromium/chrome/browser/resources/settings/site_settings/compiled_resources2.gyp
@@ -147,7 +147,6 @@
       'dependencies': [
         '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:assert',
         '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:cr',
-        '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:i18n_behavior',
         '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:load_time_data',
         '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:web_ui_listener_behavior',
         'constants',
diff --git a/chromium/chrome/browser/resources/settings/site_settings/constants.js b/chromium/chrome/browser/resources/settings/site_settings/constants.js
index 468d0b9fff3..c6a690d271f 100644
--- a/chromium/chrome/browser/resources/settings/site_settings/constants.js
+++ b/chromium/chrome/browser/resources/settings/site_settings/constants.js
@@ -57,7 +57,6 @@ settings.ContentSetting = {
  * @enum {string}
  */
 settings.SiteSettingSource = {
-  ADS_BLOCKED: 'ads-blocked',
   ADS_FILTER_BLACKLIST: 'ads-filter-blacklist',
   DEFAULT: 'default',
   // This source is for the Protected Media Identifier / Protected Content
@@ -73,12 +72,12 @@ settings.SiteSettingSource = {
 
 /**
  * A category value to use for the All Sites list.
- * @const {string}
+ * @type {string}
  */
 settings.ALL_SITES = 'all-sites';
 
 /**
  * An invalid subtype value.
- * @const {string}
+ * @type {string}
  */
 settings.INVALID_CATEGORY_SUBTYPE = '';
diff --git a/chromium/chrome/browser/resources/settings/site_settings/cookie_info.html b/chromium/chrome/browser/resources/settings/site_settings/cookie_info.html
new file mode 100644
index 00000000000..77485cabf8a
--- /dev/null
+++ b/chromium/chrome/browser/resources/settings/site_settings/cookie_info.html
@@ -0,0 +1 @@
+<script src="cookie_info.js"></script>
diff --git a/chromium/chrome/browser/resources/settings/site_settings/cookie_info.js b/chromium/chrome/browser/resources/settings/site_settings/cookie_info.js
index c41527432e4..c7c27b0fd7d 100644
--- a/chromium/chrome/browser/resources/settings/site_settings/cookie_info.js
+++ b/chromium/chrome/browser/resources/settings/site_settings/cookie_info.js
@@ -10,13 +10,13 @@
  *            totalUsage: string,
  *            type: string}}
  */
-var CookieDetails;
+let CookieDetails;
 
 /**
  * @typedef {{content: string,
  *            label: string}}
  */
-var CookieDataForDisplay;
+let CookieDataForDisplay;
 
 // This structure maps the various cookie type names from C++ (hence the
 // underscores) to arrays of the different types of data each has, along with
@@ -25,7 +25,7 @@ var CookieDataForDisplay;
 // 1) to list what subset of the cookie data we want to show in the UI.
 // 2) What order to show it in.
 // 3) What user friendly label to prefix the data with.
-/** @const */ var cookieInfo = {
+const cookieInfo = {
   'cookie': [
     ['name', 'cookieName'], ['content', 'cookieContent'],
     ['domain', 'cookieDomain'], ['path', 'cookiePath'],
@@ -79,18 +79,18 @@ var CookieDataForDisplay;
  * @param {CookieDetails} data The contents of the cookie.
  * @return {!Array<CookieDataForDisplay>}
  */
-var getCookieData = function(data) {
+const getCookieData = function(data) {
   /** @type {!Array<CookieDataForDisplay>} */
-  var out = [];
-  var fields = cookieInfo[data.type];
-  for (var i = 0; i < fields.length; i++) {
-    var field = fields[i];
+  const out = [];
+  const fields = cookieInfo[data.type];
+  for (let i = 0; i < fields.length; i++) {
+    const field = fields[i];
     // Iterate through the keys found in |cookieInfo| for the given |type|
     // and see if those keys are present in the data. If so, display them
     // (in the order determined by |cookieInfo|).
-    var key = field[0];
+    const key = field[0];
     if (data[key].length > 0) {
-      var entry = /** @type {CookieDataForDisplay} */ ({
+      const entry = /** @type {CookieDataForDisplay} */ ({
         label: loadTimeData.getString(field[1]),
         content: data[key],
       });
diff --git a/chromium/chrome/browser/resources/settings/site_settings/local_data_browser_proxy.js b/chromium/chrome/browser/resources/settings/site_settings/local_data_browser_proxy.js
index 224b4ba722d..0c1fef34002 100644
--- a/chromium/chrome/browser/resources/settings/site_settings/local_data_browser_proxy.js
+++ b/chromium/chrome/browser/resources/settings/site_settings/local_data_browser_proxy.js
@@ -14,7 +14,7 @@
  *   children: !Array<CookieDetails>,
  * }}
  */
-var CookieList;
+let CookieList;
 
 /**
  * @typedef {{
@@ -22,7 +22,7 @@ var CookieList;
  *   id: string,
  * }}
  */
-var LocalDataItem;
+let LocalDataItem;
 
 /**
  * TODO(dschuyler): add |filter| and |order|.
@@ -31,7 +31,7 @@ var LocalDataItem;
  *   total: number,
  * }}
  */
-var LocalDataList;
+let LocalDataList;
 
 cr.define('settings', function() {
   /** @interface */
diff --git a/chromium/chrome/browser/resources/settings/site_settings/protocol_handlers.js b/chromium/chrome/browser/resources/settings/site_settings/protocol_handlers.js
index 7da371a9afe..6ad35cec77e 100644
--- a/chromium/chrome/browser/resources/settings/site_settings/protocol_handlers.js
+++ b/chromium/chrome/browser/resources/settings/site_settings/protocol_handlers.js
@@ -12,7 +12,7 @@
  * All possible actions in the menu.
  * @enum {string}
  */
-var MenuActions = {
+const MenuActions = {
   SET_DEFAULT: 'SetDefault',
   REMOVE: 'Remove',
 };
@@ -22,7 +22,7 @@ var MenuActions = {
  *            protocol: string,
  *            spec: string}}
  */
-var HandlerEntry;
+let HandlerEntry;
 
 /**
  * @typedef {{default_handler: number,
@@ -31,7 +31,7 @@ var HandlerEntry;
  *            is_default_handler_set_by_user: boolean,
  *            protocol: string}}
  */
-var ProtocolEntry;
+let ProtocolEntry;
 
 Polymer({
   is: 'protocol-handlers',
@@ -166,7 +166,7 @@ Polymer({
    * @private
    */
   onDefaultTap_: function() {
-    var item = this.actionMenuModel_.item;
+    const item = this.actionMenuModel_.item;
 
     this.$$('dialog[is=cr-action-menu]').close();
     this.actionMenuModel_ = null;
@@ -178,7 +178,7 @@ Polymer({
    * @private
    */
   onRemoveTap_: function() {
-    var item = this.actionMenuModel_.item;
+    const item = this.actionMenuModel_.item;
 
     this.$$('dialog[is=cr-action-menu]').close();
     this.actionMenuModel_ = null;
diff --git a/chromium/chrome/browser/resources/settings/site_settings/site_data.html b/chromium/chrome/browser/resources/settings/site_settings/site_data.html
index 72c73a87961..c50d94123c3 100644
--- a/chromium/chrome/browser/resources/settings/site_settings/site_data.html
+++ b/chromium/chrome/browser/resources/settings/site_settings/site_data.html
@@ -13,6 +13,7 @@
 <link rel="import" href="../global_scroll_target_behavior.html">
 <link rel="import" href="../settings_page/settings_subpage_search.html">
 <link rel="import" href="../settings_shared_css.html">
+<link rel="import" href="cookie_info.html">
 <link rel="import" href="local_data_browser_proxy.html">
 <link rel="import" href="site_settings_behavior.html">
 
@@ -89,6 +90,5 @@
       </div>
     </dialog>
   </template>
-  <script src="cookie_info.js"></script>
   <script src="site_data.js"></script>
 </dom-module>
diff --git a/chromium/chrome/browser/resources/settings/site_settings/site_data.js b/chromium/chrome/browser/resources/settings/site_settings/site_data.js
index e0e85e99d8b..4dbf87f04fc 100644
--- a/chromium/chrome/browser/resources/settings/site_settings/site_data.js
+++ b/chromium/chrome/browser/resources/settings/site_settings/site_data.js
@@ -14,7 +14,7 @@
  *   localData: string,
  * }}
  */
-var CookieDataSummaryItem;
+let CookieDataSummaryItem;
 
 /**
  * @typedef {{
@@ -23,7 +23,7 @@ var CookieDataSummaryItem;
  *   count: number,
  * }}
  */
-var CookieRemovePacket;
+let CookieRemovePacket;
 
 /**
  * TODO(dbeam): upstream to polymer externs?
@@ -113,7 +113,10 @@ Polymer({
    * @private
    */
   favicon_: function(url) {
-    return cr.icon.getFavicon(url);
+    // If the url doesn't have a scheme, inject HTTP as the scheme. Otherwise,
+    // the URL isn't valid and no icon will be returned.
+    const urlWithScheme = url.includes('://') ? url : 'http://' + url;
+    return cr.icon.getFavicon(urlWithScheme);
   },
 
   /**
diff --git a/chromium/chrome/browser/resources/settings/site_settings/site_data_details_subpage.html b/chromium/chrome/browser/resources/settings/site_settings/site_data_details_subpage.html
index 5544d8ffdbc..958e28f8cb5 100644
--- a/chromium/chrome/browser/resources/settings/site_settings/site_data_details_subpage.html
+++ b/chromium/chrome/browser/resources/settings/site_settings/site_data_details_subpage.html
@@ -6,6 +6,7 @@
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button-light.html">
 <link rel="import" href="../route.html">
 <link rel="import" href="../settings_shared_css.html">
+<link rel="import" href="cookie_info.html">
 <link rel="import" href="local_data_browser_proxy.html">
 
 <dom-module id="site-data-details-subpage">
@@ -23,8 +24,8 @@
     </style>
     <template is="dom-repeat" items="[[entries_]]">
       <div class="settings-box" first$="[[!index]]">
-        <div class="start">[[getEntryDescription_(item)]]</div>
-        <cr-expand-button expanded="{{item.expanded_}}">
+        <cr-expand-button class="start" expanded="{{item.expanded_}}">
+          [[getEntryDescription_(item)]]
         </cr-expand-button>
         <div class="separator"></div>
         <button is="paper-icon-button-light" data-id-path$="[[item.idPath]]"
@@ -44,6 +45,5 @@
       </iron-collapse>
     </template>
   </template>
-  <script src="cookie_info.js"></script>
   <script src="site_data_details_subpage.js"></script>
 </dom-module>
diff --git a/chromium/chrome/browser/resources/settings/site_settings/site_data_details_subpage.js b/chromium/chrome/browser/resources/settings/site_settings/site_data_details_subpage.js
index b749a1f87d4..42d171e9d23 100644
--- a/chromium/chrome/browser/resources/settings/site_settings/site_data_details_subpage.js
+++ b/chromium/chrome/browser/resources/settings/site_settings/site_data_details_subpage.js
@@ -5,7 +5,7 @@
 (function() {
 'use strict';
 
-var categoryLabels = {
+const categoryLabels = {
   app_cache: loadTimeData.getString('cookieAppCache'),
   cache_storage: loadTimeData.getString('cookieCacheStorage'),
   channel_id: loadTimeData.getString('cookieChannelId'),
@@ -71,7 +71,7 @@ Polymer({
     if (settings.getCurrentRoute() !=
         settings.routes.SITE_SETTINGS_DATA_DETAILS)
       return;
-    var site = settings.getQueryParameters().get('site');
+    const site = settings.getQueryParameters().get('site');
     if (!site)
       return;
     this.site_ = site;
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 b7fe492082f..6d4f9c7c7db 100644
--- a/chromium/chrome/browser/resources/settings/site_settings/site_details.js
+++ b/chromium/chrome/browser/resources/settings/site_settings/site_details.js
@@ -108,7 +108,7 @@ Polymer({
    * @protected
    */
   currentRouteChanged: function(route) {
-    var site = settings.getQueryParameters().get('site');
+    const site = settings.getQueryParameters().get('site');
     if (!site)
       return;
     this.origin = site;
@@ -167,7 +167,7 @@ Polymer({
    * @private
    */
   updatePermissions_: function(categoryList) {
-    var permissionsMap =
+    const permissionsMap =
         /** @type {!Object<!settings.ContentSettingsTypes,
          *         !SiteDetailsPermissionElement>} */
         (Array.prototype.reduce.call(
@@ -249,7 +249,7 @@ Polymer({
    * @private
    */
   getCategoryList_: function() {
-    var categoryList = [];
+    const categoryList = [];
     this.root.querySelectorAll('site-details-permission').forEach((element) => {
       if (!element.hidden)
         categoryList.push(element.category);
diff --git a/chromium/chrome/browser/resources/settings/site_settings/site_details_permission.html b/chromium/chrome/browser/resources/settings/site_settings/site_details_permission.html
index fdf7d369701..fc064fdf26d 100644
--- a/chromium/chrome/browser/resources/settings/site_settings/site_details_permission.html
+++ b/chromium/chrome/browser/resources/settings/site_settings/site_details_permission.html
@@ -1,7 +1,6 @@
 <link rel="import" href="chrome://resources/html/polymer.html">
 
 <link rel="import" href="chrome://resources/html/md_select_css.html">
-<link rel="import" href="chrome://resources/html/i18n_behavior.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
 <link rel="import" href="../settings_shared_css.html">
@@ -40,7 +39,8 @@
                 '$i18nPolymer{siteSettingsSourceExtensionAsk}',
                 '$i18nPolymer{siteSettingsSourcePolicyAllow}',
                 '$i18nPolymer{siteSettingsSourcePolicyBlock}',
-                '$i18nPolymer{siteSettingsSourcePolicyAsk}')]]">
+                '$i18nPolymer{siteSettingsSourcePolicyAsk}',
+                '$i18nPolymer{siteSettingsSourceDrmDisabled}')]]">
           </div>
         </div>
         <div class="md-select-wrapper">
@@ -49,8 +49,7 @@
               on-change="onPermissionSelectionChange_"
               disabled$="[[!isPermissionUserControlled_(site.source, category,
                                                         site.setting)]]">
-            <option id="default" value$="[[ContentSetting.DEFAULT]]"
-                hidden$="[[isAdsCategory_(category)]]">
+            <option id="default" value$="[[ContentSetting.DEFAULT]]">
               [[defaultSettingString_(
                   defaultSetting_,
                   '$i18nPolymer{siteSettingsActionAskDefault}',
diff --git a/chromium/chrome/browser/resources/settings/site_settings/site_details_permission.js b/chromium/chrome/browser/resources/settings/site_settings/site_details_permission.js
index e01a47a8478..4cfe5f16378 100644
--- a/chromium/chrome/browser/resources/settings/site_settings/site_details_permission.js
+++ b/chromium/chrome/browser/resources/settings/site_settings/site_details_permission.js
@@ -10,7 +10,7 @@
 Polymer({
   is: 'site-details-permission',
 
-  behaviors: [SiteSettingsBehavior, WebUIListenerBehavior, I18nBehavior],
+  behaviors: [SiteSettingsBehavior, WebUIListenerBehavior],
 
   properties: {
     /**
@@ -129,9 +129,15 @@ Polymer({
    * @private
    */
   hasPermissionInfoString_: function(source, category, setting) {
-    return (
-        source != settings.SiteSettingSource.DEFAULT &&
-        source != settings.SiteSettingSource.PREFERENCE);
+    // This method assumes that an empty string will be returned for categories
+    // that have no permission info string.
+    return this.permissionInfoString_(
+               source, category, setting,
+               // Set all permission info string arguments as null. This is OK
+               // because there is no need to know what the information string
+               // will be, just whether there is one or not.
+               null, null, null, null, null, null, null, null, null, null, null,
+               null) != '';
   },
 
   /**
@@ -153,17 +159,16 @@ Polymer({
   /**
    * Returns true if this permission can be controlled by the user.
    * @param {!settings.SiteSettingSource} source The source of the permission.
-   * @param {!settings.ContentSettingsTypes} category The permission type.
-   * @param {!settings.ContentSetting} setting The permission setting.
    * @return {boolean}
    * @private
    */
-  isPermissionUserControlled_: function(source, category, setting) {
-    // Users are able override embargo and ads blacklisting.
-    return !this.hasPermissionInfoString_(source, category, setting) ||
-        source == settings.SiteSettingSource.EMBARGO ||
-        source == settings.SiteSettingSource.ADS_FILTER_BLACKLIST ||
-        source == settings.SiteSettingSource.ADS_BLOCKED;
+  isPermissionUserControlled_: function(source) {
+    return !(
+        source == settings.SiteSettingSource.DRM_DISABLED ||
+        source == settings.SiteSettingSource.POLICY ||
+        source == settings.SiteSettingSource.EXTENSION ||
+        source == settings.SiteSettingSource.KILL_SWITCH ||
+        source == settings.SiteSettingSource.INSECURE_ORIGIN);
   },
 
   /**
@@ -187,50 +192,42 @@ Polymer({
   },
 
   /**
-   * Returns true if this permission is the Ads permission.
-   * @param {!settings.ContentSettingsTypes} category The permission type.
-   * @return {boolean}
-   * @private
-   */
-  isAdsCategory_: function(category) {
-    return category == settings.ContentSettingsTypes.ADS;
-  },
-
-  /**
    * Updates the information string for the current permission.
    * Currently, this only gets called when |this.site| is updated.
    * @param {!settings.SiteSettingSource} source The source of the permission.
    * @param {!settings.ContentSettingsTypes} category The permission type.
    * @param {!settings.ContentSetting} setting The permission setting.
-   * @param {!string} adsBlacklistString The string to show if the site is
+   * @param {?string} adsBlacklistString The string to show if the site is
    *     blacklisted for showing bad ads.
-   * @param {!string} adsBlockString The string to show if ads are blocked, but
+   * @param {?string} adsBlockString The string to show if ads are blocked, but
    *     the site is not blacklisted.
-   * @param {!string} embargoString
-   * @param {!string} insecureOriginString
-   * @param {!string} killSwitchString
-   * @param {!string} extensionAllowString
-   * @param {!string} extensionBlockString
-   * @param {!string} extensionAskString
-   * @param {!string} policyAllowString
-   * @param {!string} policyBlockString
-   * @param {!string} policyAskString
+   * @param {?string} embargoString
+   * @param {?string} insecureOriginString
+   * @param {?string} killSwitchString
+   * @param {?string} extensionAllowString
+   * @param {?string} extensionBlockString
+   * @param {?string} extensionAskString
+   * @param {?string} policyAllowString
+   * @param {?string} policyBlockString
+   * @param {?string} policyAskString
+   * @param {?string} drmDisabledString
+   * @return {?string} The permission information string to display in the HTML.
    * @private
    */
   permissionInfoString_: function(
       source, category, setting, adsBlacklistString, adsBlockString,
       embargoString, insecureOriginString, killSwitchString,
       extensionAllowString, extensionBlockString, extensionAskString,
-      policyAllowString, policyBlockString, policyAskString) {
-
-    /** @type {Object<!settings.ContentSetting, string>} */
-    var extensionStrings = {};
+      policyAllowString, policyBlockString, policyAskString,
+      drmDisabledString) {
+    /** @type {Object<!settings.ContentSetting, ?string>} */
+    const extensionStrings = {};
     extensionStrings[settings.ContentSetting.ALLOW] = extensionAllowString;
     extensionStrings[settings.ContentSetting.BLOCK] = extensionBlockString;
     extensionStrings[settings.ContentSetting.ASK] = extensionAskString;
 
-    /** @type {Object<!settings.ContentSetting, string>} */
-    var policyStrings = {};
+    /** @type {Object<!settings.ContentSetting, ?string>} */
+    const policyStrings = {};
     policyStrings[settings.ContentSetting.ALLOW] = policyAllowString;
     policyStrings[settings.ContentSetting.BLOCK] = policyBlockString;
     policyStrings[settings.ContentSetting.ASK] = policyAskString;
@@ -240,13 +237,9 @@ Polymer({
           settings.ContentSettingsTypes.ADS == category,
           'The ads filter blacklist only applies to Ads.');
       return adsBlacklistString;
-    } else if (source == settings.SiteSettingSource.ADS_BLOCKED) {
-      assert(
-          settings.ContentSettingsTypes.ADS == category,
-          'The Ads user-blocked source only applies to Ads.');
-      assert(
-          settings.ContentSetting.ALLOW != setting,
-          'The Ads setting must be blocked for this source.');
+    } else if (
+        category == settings.ContentSettingsTypes.ADS &&
+        setting == settings.ContentSetting.BLOCK) {
       return adsBlockString;
     } else if (source == settings.SiteSettingSource.DRM_DISABLED) {
       assert(
@@ -255,10 +248,12 @@ Polymer({
       assert(
           settings.ContentSettingsTypes.PROTECTED_CONTENT == category,
           'The DRM disabled source only applies to Protected Content.');
-      return this.i18nAdvanced('siteSettingsSourceDrmDisabled', {
-        substitutions:
-            [settings.routes.SITE_SETTINGS_PROTECTED_CONTENT.getAbsolutePath()]
-      });
+      if (!drmDisabledString) {
+        return null;
+      }
+      return loadTimeData.sanitizeInnerHtml(loadTimeData.substituteString(
+          drmDisabledString,
+          settings.routes.SITE_SETTINGS_PROTECTED_CONTENT.getAbsolutePath()));
     } else if (source == settings.SiteSettingSource.EMBARGO) {
       assert(
           settings.ContentSetting.BLOCK == setting,
diff --git a/chromium/chrome/browser/resources/settings/site_settings/site_list.js b/chromium/chrome/browser/resources/settings/site_settings/site_list.js
index f2fd85b0d53..178af8c4439 100644
--- a/chromium/chrome/browser/resources/settings/site_settings/site_list.js
+++ b/chromium/chrome/browser/resources/settings/site_settings/site_list.js
@@ -208,7 +208,7 @@ Polymer({
   onAddSiteTap_: function(e) {
     assert(!this.readOnlyList);
     e.preventDefault();
-    var dialog = document.createElement('add-site-dialog');
+    const dialog = document.createElement('add-site-dialog');
     dialog.category = this.category;
     dialog.contentSetting = this.categorySubtype;
     this.shadowRoot.appendChild(dialog);
@@ -239,10 +239,10 @@ Polymer({
    * @private
    */
   processExceptions_: function(data) {
-    var sites = /** @type {!Array<RawSiteException>} */ ([]);
-    for (var i = 0; i < data.length; ++i) {
-      var exceptionList = data[i];
-      for (var k = 0; k < exceptionList.length; ++k) {
+    const sites = /** @type {!Array<RawSiteException>} */ ([]);
+    for (let i = 0; i < data.length; ++i) {
+      const exceptionList = data[i];
+      for (let k = 0; k < exceptionList.length; ++k) {
         if (exceptionList[k].setting == settings.ContentSetting.DEFAULT ||
             exceptionList[k].setting != this.categorySubtype) {
           continue;
@@ -262,12 +262,12 @@ Polymer({
    * @private
    */
   toSiteArray_: function(sites) {
-    var results = /** @type {!Array<SiteException>} */ ([]);
-    var lastOrigin = '';
-    var lastEmbeddingOrigin = '';
-    for (var i = 0; i < sites.length; ++i) {
+    const results = /** @type {!Array<SiteException>} */ ([]);
+    let lastOrigin = '';
+    let lastEmbeddingOrigin = '';
+    for (let i = 0; i < sites.length; ++i) {
       /** @type {!SiteException} */
-      var siteException = this.expandSiteException(sites[i]);
+      const siteException = this.expandSiteException(sites[i]);
 
       results.push(siteException);
       lastOrigin = siteException.origin;
@@ -389,7 +389,7 @@ Polymer({
    * @return {string} The site description.
    */
   computeSiteDescription_: function(item) {
-    var displayName = '';
+    let displayName = '';
     if (item.embeddingOrigin) {
       displayName = loadTimeData.getStringF(
           'embeddedOnHost', this.sanitizePort(item.embeddingOrigin));
@@ -430,7 +430,7 @@ Polymer({
   closeActionMenu_: function() {
     this.actionMenuSite_ = null;
     this.activeDialogAnchor_ = null;
-    var actionMenu = /** @type {!CrActionMenuElement} */ (
+    const actionMenu = /** @type {!CrActionMenuElement} */ (
         this.$$('dialog[is=cr-action-menu]'));
     if (actionMenu.open)
       actionMenu.close();
diff --git a/chromium/chrome/browser/resources/settings/site_settings/site_settings_behavior.js b/chromium/chrome/browser/resources/settings/site_settings/site_settings_behavior.js
index 500344800ba..5d43d656173 100644
--- a/chromium/chrome/browser/resources/settings/site_settings/site_settings_behavior.js
+++ b/chromium/chrome/browser/resources/settings/site_settings/site_settings_behavior.js
@@ -13,7 +13,7 @@
  * TODO(dschuyler): Can they be unified (and this dictionary removed)?
  * @type {!Object}
  */
-var kControlledByLookup = {
+const kControlledByLookup = {
   'extension': chrome.settingsPrivate.ControlledBy.EXTENSION,
   'HostedApp': chrome.settingsPrivate.ControlledBy.EXTENSION,
   'platform_app': chrome.settingsPrivate.ControlledBy.EXTENSION,
@@ -22,7 +22,7 @@ var kControlledByLookup = {
 
 
 /** @polymerBehavior */
-var SiteSettingsBehaviorImpl = {
+const SiteSettingsBehaviorImpl = {
   properties: {
     /**
      * The string ID of the category this element is displaying data for.
@@ -67,7 +67,7 @@ var SiteSettingsBehaviorImpl = {
    * @return {string} The URL without redundant ports, if any.
    */
   sanitizePort: function(url) {
-    var urlWithScheme = this.ensureUrlHasScheme(url);
+    const urlWithScheme = this.ensureUrlHasScheme(url);
     if (urlWithScheme.startsWith('https://') &&
         urlWithScheme.endsWith(':443')) {
       return url.slice(0, -4);
@@ -101,7 +101,8 @@ var SiteSettingsBehaviorImpl = {
    * @private
    */
   computeSiteIcon: function(site) {
-    var url = this.ensureUrlHasScheme(site);
+    site = this.removePatternWildcard(site);
+    const url = this.ensureUrlHasScheme(site);
     return 'background-image: ' + cr.icon.getFavicon(url);
   },
 
@@ -142,18 +143,18 @@ var SiteSettingsBehaviorImpl = {
    * @private
    */
   expandSiteException: function(exception) {
-    var origin = exception.origin;
-    var embeddingOrigin = exception.embeddingOrigin;
+    const origin = exception.origin;
+    const embeddingOrigin = exception.embeddingOrigin;
 
     // TODO(patricialor): |exception.source| should be one of the values defined
     // in |settings.SiteSettingSource|.
-    var enforcement = /** @type {?chrome.settingsPrivate.Enforcement} */ (null);
+    let enforcement = /** @type {?chrome.settingsPrivate.Enforcement} */ (null);
     if (exception.source == 'extension' || exception.source == 'HostedApp' ||
         exception.source == 'platform_app' || exception.source == 'policy') {
       enforcement = chrome.settingsPrivate.Enforcement.ENFORCED;
     }
 
-    var controlledBy = /** @type {!chrome.settingsPrivate.ControlledBy} */ (
+    const controlledBy = /** @type {!chrome.settingsPrivate.ControlledBy} */ (
         kControlledByLookup[exception.source] ||
         chrome.settingsPrivate.ControlledBy.PRIMARY_USER);
 
@@ -172,4 +173,4 @@ var SiteSettingsBehaviorImpl = {
 };
 
 /** @polymerBehavior */
-var SiteSettingsBehavior = [SiteSettingsBehaviorImpl];
+const SiteSettingsBehavior = [SiteSettingsBehaviorImpl];
diff --git a/chromium/chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.js b/chromium/chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.js
index e19f90cfec8..81a019ec3c4 100644
--- a/chromium/chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.js
+++ b/chromium/chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.js
@@ -13,7 +13,7 @@
  * should be treated as 'default'.
  * @enum {string}
  */
-var ContentSettingProvider = {
+const ContentSettingProvider = {
   EXTENSION: 'extension',
   PREFERENCE: 'preference',
 };
@@ -28,7 +28,7 @@ var ContentSettingProvider = {
  *            setting: !settings.ContentSetting,
  *            source: !settings.SiteSettingSource}}
  */
-var RawSiteException;
+let RawSiteException;
 
 /**
  * The site exception after it has been converted/filtered for UI use.
@@ -42,25 +42,25 @@ var RawSiteException;
  *            enforcement: ?chrome.settingsPrivate.Enforcement,
  *            controlledBy: !chrome.settingsPrivate.ControlledBy}}
  */
-var SiteException;
+let SiteException;
 
 /**
  * @typedef {{setting: !settings.ContentSetting,
  *            source: !ContentSettingProvider}}
  */
-var DefaultContentSetting;
+let DefaultContentSetting;
 
 /**
  * @typedef {{name: string,
  *            id: string}}
  */
-var MediaPickerEntry;
+let MediaPickerEntry;
 
 /**
  * @typedef {{protocol: string,
  *            spec: string}}
  */
-var ProtocolHandlerEntry;
+let ProtocolHandlerEntry;
 
 /**
  * @typedef {{name: string,
@@ -68,7 +68,7 @@ var ProtocolHandlerEntry;
  *            serial-number: string,
  *            vendor-id: Number}}
  */
-var UsbDeviceDetails;
+let UsbDeviceDetails;
 
 /**
  * @typedef {{embeddingOrigin: string,
@@ -78,7 +78,7 @@ var UsbDeviceDetails;
  *            setting: string,
  *            source: string}}
  */
-var UsbDeviceEntry;
+let UsbDeviceEntry;
 
 /**
  * @typedef {{origin: string,
@@ -86,7 +86,7 @@ var UsbDeviceEntry;
  *            source: string,
  *            zoom: string}}
  */
-var ZoomLevelEntry;
+let ZoomLevelEntry;
 
 cr.define('settings', function() {
   /** @interface */
diff --git a/chromium/chrome/browser/resources/settings/site_settings/usb_devices.js b/chromium/chrome/browser/resources/settings/site_settings/usb_devices.js
index c4e64f3891a..e463624daa1 100644
--- a/chromium/chrome/browser/resources/settings/site_settings/usb_devices.js
+++ b/chromium/chrome/browser/resources/settings/site_settings/usb_devices.js
@@ -57,7 +57,7 @@ Polymer({
   onRemoveTap_: function() {
     this.$$('dialog[is=cr-action-menu]').close();
 
-    var item = this.actionMenuModel_;
+    const item = this.actionMenuModel_;
     this.browserProxy.removeUsbDevice(
         item.origin, item.embeddingOrigin, item.object);
     this.actionMenuModel_ = null;
diff --git a/chromium/chrome/browser/resources/settings/site_settings/website_usage_private_api.js b/chromium/chrome/browser/resources/settings/site_settings/website_usage_private_api.js
index 4540e26a315..17540e1d876 100644
--- a/chromium/chrome/browser/resources/settings/site_settings/website_usage_private_api.js
+++ b/chromium/chrome/browser/resources/settings/site_settings/website_usage_private_api.js
@@ -56,20 +56,21 @@ cr.define('settings.WebsiteUsagePrivateApi', function() {
    * @type {Object} An instance of the polymer object defined above.
    * All data will be set here.
    */
-  var websiteUsagePolymerInstance = null;
+  const websiteUsagePolymerInstance = null;
 
   /**
    * @type {string} The host for which the usage total is being fetched.
    */
-  var hostName;
+  let hostName;
 
   /**
    * Encapsulates the calls between JS and C++ to fetch how much storage the
    * host is using.
    * Will update the data in |websiteUsagePolymerInstance|.
    */
-  var fetchUsageTotal = function(host) {
-    var instance = settings.WebsiteUsagePrivateApi.websiteUsagePolymerInstance;
+  const fetchUsageTotal = function(host) {
+    const instance =
+        settings.WebsiteUsagePrivateApi.websiteUsagePolymerInstance;
     if (instance != null)
       instance.websiteDataUsage = '';
 
@@ -84,8 +85,9 @@ cr.define('settings.WebsiteUsagePrivateApi', function() {
    *     is using.
    * @param {number} type The storage type.
    */
-  var returnUsageTotal = function(host, usage, type) {
-    var instance = settings.WebsiteUsagePrivateApi.websiteUsagePolymerInstance;
+  const returnUsageTotal = function(host, usage, type) {
+    const instance =
+        settings.WebsiteUsagePrivateApi.websiteUsagePolymerInstance;
     if (instance == null)
       return;
 
@@ -100,7 +102,7 @@ cr.define('settings.WebsiteUsagePrivateApi', function() {
    * @param {string} origin The origin to delete storage for.
    * @param {number} type The type of storage to delete.
    */
-  var clearUsage = function(origin, type) {
+  const clearUsage = function(origin, type) {
     chrome.send('clearUsage', [origin, type]);
   };
 
@@ -108,8 +110,9 @@ cr.define('settings.WebsiteUsagePrivateApi', function() {
    * Callback for when the usage has been cleared.
    * @param {string} origin The origin that the usage was fetched for.
    */
-  var onUsageCleared = function(origin) {
-    var instance = settings.WebsiteUsagePrivateApi.websiteUsagePolymerInstance;
+  const onUsageCleared = function(origin) {
+    const instance =
+        settings.WebsiteUsagePrivateApi.websiteUsagePolymerInstance;
     if (instance == null)
       return;
 
diff --git a/chromium/chrome/browser/resources/settings/site_settings/zoom_levels.js b/chromium/chrome/browser/resources/settings/site_settings/zoom_levels.js
index 850501b8cd5..eeeb057da00 100644
--- a/chromium/chrome/browser/resources/settings/site_settings/zoom_levels.js
+++ b/chromium/chrome/browser/resources/settings/site_settings/zoom_levels.js
@@ -43,7 +43,7 @@ Polymer({
    * @private
    */
   removeZoomLevel_: function(event) {
-    var site = this.sites_[event.model.index];
+    const site = this.sites_[event.model.index];
     this.browserProxy.removeZoomLevel(site.origin);
   },
 });