Simplify Site Settings tests.

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Define a global boolean for notifications (only enabled in the test class).
-cr.exportPath('settings_test');
-
-/** @type {boolean} */
-settings_test.siteListNotifyForTest;
-
 /**
  * @fileoverview
  * 'settings-site-list' shows a list of Allowed and Blocked sites for a given
  * category.
  */
 Polymer({
 
   is: 'settings-site-list',
 
   behaviors: [SiteSettingsBehavior, WebUIListenerBehavior],
@@ skipping 11 matching lines @@
      * The site that was selected by the user in the dropdown list.
      * @type {SiteException}
      */
     selectedSite: {
       type: Object,
       notify: true,
     },
 
     /**
      * Array of sites to display in the widget.
+     * @type {!Array<SiteException>}
      */
     sites: {
       type: Array,
       value: function() { return []; },
-      notify: true,  // !!settings_test.siteListNotifyForTest,
     },
 
     /**
      * Whether this list is for the All Sites category.
      */
     allSites: {
       type: Boolean,
       value: false,
     },
 
@@ skipping 91 matching lines @@
     // Allowed list is always shown opened by default and All Sites is presented
     // all in one list (nothing closed by default).
     if (this.allSites ||
         this.categorySubtype == settings.PermissionValues.ALLOW) {
       this.$.category.opened = true;
       return;
     }
 
     // Block list should only be shown opened if there is nothing to show in
     // the allowed list.
-    var prefsProxy = settings.SiteSettingsPrefsBrowserProxyImpl.getInstance();
-    prefsProxy.getExceptionList(this.category).then(function(exceptionList) {
-      for (var i = 0; i < exceptionList.length; ++i) {
-        if (exceptionList[i].setting == 'allow')
-          return;
-      }
+    if (this.category != settings.INVALID_CATEGORY_SUBTYPE) {
+      var browserProxy =

[dpapad, 2016/03/31 17:37:07]

Nit: Instead of calling getInstance() three times in this file, how about
calling it once in ready()?

ready: function() {
  this.browserProxy_ = settings.SiteSettingsPrefsBrowserProxyImpl.getInstance();
  ....
}

[Finnur, 2016/04/04 13:59:24]

Converted to this.browserProxy_.

+          settings.SiteSettingsPrefsBrowserProxyImpl.getInstance();
+      browserProxy.getExceptionList(this.category).then(
+        function(exceptionList) {
+          var allowExists = exceptionList.some(function(exception) {
+            return exception.setting == settings.PermissionStringValues.ALLOW;
+          });
+          if (allowExists)
+            return;
+          this.$.category.opened = true;
+      }.bind(this));
+    } else {
       this.$.category.opened = true;
-    }.bind(this));
+    }
   },
 
   /**
    * Makes sure the visibility is correct for this widget (e.g. hidden if the
    * block list is empty).
    * @private
    */
   updateCategoryVisibility_: function() {
     this.$.category.hidden =
         !this.showSiteList_(this.sites, this.categoryEnabled);
@@ skipping 13 matching lines @@
   /**
    * Populate the sites list for display.
    * @private
    */
   populateList_: function() {
     if (this.allSites) {
       this.getAllSitesList_().then(function(lists) {
         this.processExceptions_(lists);
       }.bind(this));
     } else {
-      var prefsProxy = settings.SiteSettingsPrefsBrowserProxyImpl.getInstance();
-      prefsProxy.getExceptionList(this.category).then(function(exceptionList) {
-        this.processExceptions_([exceptionList]);
+      var browserProxy =
+          settings.SiteSettingsPrefsBrowserProxyImpl.getInstance();
+      browserProxy.getExceptionList(this.category).then(
+        function(exceptionList) {
+          this.processExceptions_([exceptionList]);
       }.bind(this));
     }
   },
 
   /**
    * Process the exception list returned from the native layer.
    * @param {!Array<!Array<SiteException>>} data List of sites (exceptions) to
    *     process.
    * @private
    */
   processExceptions_: function(data) {
     var sites = [];
     for (var i = 0; i < data.length; ++i)
       sites = this.appendSiteList_(sites, data[i]);
     this.sites = this.toSiteArray_(sites);
     this.updateCategoryVisibility_();
   },
 
   /**
    * Retrieves a list of all known sites (any category/setting).
    * @return {!Promise}
    * @private
    */
   getAllSitesList_: function() {
-    var prefsProxy = settings.SiteSettingsPrefsBrowserProxyImpl.getInstance();
+    var browserProxy = settings.SiteSettingsPrefsBrowserProxyImpl.getInstance();
     var promiseList = [];
     for (var type in settings.ContentSettingsTypes) {
       promiseList.push(
-          prefsProxy.getExceptionList(settings.ContentSettingsTypes[type]));
+          browserProxy.getExceptionList(settings.ContentSettingsTypes[type]));
     }
 
     return Promise.all(promiseList);
   },
 
   /**
    * Appends to |list| the sites for a given category and subtype.
    * @param {!Array<SiteException>} sites The site list to add to.
    * @param {!Array<SiteException>} exceptionList List of sites (exceptions) to
    *     add.
    * @return {!Array<SiteException>} The list of sites.
    * @private
    */
   appendSiteList_: function(sites, exceptionList) {
     for (var i = 0; i < exceptionList.length; ++i) {
       if (this.category != settings.ALL_SITES) {
         // Filter out 'Block' values if this list is handling 'Allow' items.
-        if (exceptionList[i].setting == 'block' &&
+        if (exceptionList[i].setting == settings.PermissionStringValues.BLOCK &&
             this.categorySubtype != settings.PermissionValues.BLOCK) {
           continue;
         }
         // Filter out 'Allow' values if this list is handling 'Block' items.
-        if (exceptionList[i].setting == 'allow' &&
+        if (exceptionList[i].setting == settings.PermissionStringValues.ALLOW &&
             this.categorySubtype != settings.PermissionValues.ALLOW) {
           continue;
         }
       }
 
       sites.push(exceptionList[i]);
     }
     return sites;
   },
 
@@ skipping 170 matching lines @@
    * Returns the icon to use for a given site.
    * @param {string} url The url of the site to fetch the icon for.
    * @private
    */
   computeSiteIcon_: function(url) {
     // TODO(finnur): For now, we're returning a placeholder image for each site
     // but the actual favicon for each site will need to be returned.
     return 'communication:message';
   },
 });