MD Settings: Set all content setting values in Site Details Javascript.

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

Index: chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.js
diff --git a/chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.js b/chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.js
index ecbd1c138d70f5b520611d535a0a904a06a42cbd..d249fe947458e8b76e813b18fab891f1d31ff7b9 100644
--- a/chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.js
+++ b/chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.js
@@ -19,7 +19,7 @@ var ContentSettingProvider = {
 };
 
 /**
- * The site exception information passed form the C++ handler.
+ * The site exception information passed from the C++ handler.
  * See also: SiteException.
  * @typedef {{embeddingOrigin: string,
  *            embeddingDisplayName: string,
@@ -130,13 +130,6 @@ cr.define('settings', function() {
     getExceptionList: function(contentType) {},
 
     /**
-     * Gets the exception details for a particular site.
-     * @param {string} site The name of the site.
-     * @return {!Promise<!RawSiteException>}
-     */
-    getSiteDetails: function(site) {},
-
-    /**
      * Resets the category permission for a given origin (expressed as primary
      *    and secondary patterns).
      * @param {string} primaryPattern The origin to change (primary pattern).
@@ -150,6 +143,16 @@ cr.define('settings', function() {
         primaryPattern, secondaryPattern, contentType, incognito) {},
 
     /**
+     * Gets the category permission for a given origin. Note that this may be
+     * different to the result retrieved by getExceptionList(), since it
+     * combines different sources of data into a single value.
+     * @param {string} contentType The name of the category to query.
+     * @param {string} origin The origin to look up the permission for.
+     * @return {!Promise<!RawSiteException>}
+     */
+    getCategoryPermissionForOrigin: function(contentType, origin) {},
+
+    /**
      * Sets the category permission for a given origin (expressed as primary
      *    and secondary patterns).
      * @param {string} primaryPattern The origin to change (primary pattern).
@@ -319,11 +322,6 @@ cr.define('settings', function() {
     },
 
     /** @override */
-    getSiteDetails: function(site) {
-      return cr.sendWithPromise('getSiteDetails', site);
-    },
-
-    /** @override */
     resetCategoryPermissionForOrigin: function(
         primaryPattern, secondaryPattern, contentType, incognito) {
       chrome.send(
@@ -332,6 +330,12 @@ cr.define('settings', function() {
     },
 
     /** @override */
+    getCategoryPermissionForOrigin: function(contentType, origin) {
+      return cr.sendWithPromise(
+          'getCategoryPermissionForOrigin', contentType, origin);
+    },
+
+    /** @override */
     setCategoryPermissionForOrigin: function(
         primaryPattern, secondaryPattern, contentType, value, incognito) {
       // TODO(dschuyler): It may be incorrect for JS to send the embeddingOrigin