[MD settings] show blocked sites even when category is blocked

chrome/browser/resources/settings/site_settings/add_site_dialog.js

Index: chrome/browser/resources/settings/site_settings/add_site_dialog.js
diff --git a/chrome/browser/resources/settings/site_settings/add_site_dialog.js b/chrome/browser/resources/settings/site_settings/add_site_dialog.js
index 6c09138011aecb0055a15394f7f2fafd4e795087..162225f13acb7a56e57a05312aacae386286629f 100644
--- a/chrome/browser/resources/settings/site_settings/add_site_dialog.js
+++ b/chrome/browser/resources/settings/site_settings/add_site_dialog.js
@@ -14,15 +14,17 @@ Polymer({
 
   properties: {
     /**
-     * The site to add an exception for.
-     * @private
+     * Whether this is an allow exception this dialog is adding.
      */
-    site_: String,
+    allowException: Boolean,

[dpapad, 2016/11/07 21:59:35]

This was used when calling browserProxy.setCategoryPermissionForOrigin before. I
don't see any uses of it now, is it still necessary?

[dschuyler, 2016/11/07 23:54:04]

Done.

+
+    contentSetting: String,

[dpapad, 2016/11/07 21:59:35]

Can you add a comment explaining what does this member var hold? It is not clear
without any context.

[dschuyler, 2016/11/07 23:54:04]

Done.

 
     /**
-     * Whether this is an allow exception this dialog is adding.
+     * The site to add an exception for.
+     * @private
      */
-     allowException: Boolean,
+    site_: String,
   },
 
   /**
@@ -76,8 +78,7 @@ Polymer({
       return;  // Can happen when Enter is pressed.
     var pattern = this.addPatternWildcard(this.site_);
     this.browserProxy.setCategoryPermissionForOrigin(
-        pattern, pattern, this.category, this.allowException ?
-            settings.PermissionValues.ALLOW : settings.PermissionValues.BLOCK,
+        pattern, pattern, this.category, this.contentSetting,

[dpapad, 2016/11/07 21:59:35]

Are we assuming that |contentSettings| has been populated by a parent? Can we
add an assertion before calling setCategoryPermissionForOrigin?

[dschuyler, 2016/11/07 23:54:04]

I added asserts in attached so that they would be checked early and
have lower overhead (vs checking in member functions other than
attached).

         this.$.incognito.checked);
     this.$.dialog.close();
   },