[MD settings] remove count of content items in content settings

chrome/test/data/webui/settings/site_list_tests.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.
 
 /** @fileoverview Suite of tests for site-list. */
 cr.define('site_list', function() {
   function registerTests() {
     suite('SiteList', function() {
       /**
        * A site list element created before each test.
@@ skipping 383 matching lines @@
             settings.PermissionValues.ALLOW, prefsEmpty);
         return browserProxy.whenCalled('getExceptionList').then(
             function(contentType) {
               assertEquals(
                   settings.ContentSettingsTypes.GEOLOCATION, contentType);
 
               assertEquals(0, testElement.sites.length);
 
               assertEquals(
                   settings.PermissionValues.ALLOW, testElement.categorySubtype);
-              assertEquals('Allow - 0', testElement.$.header.innerText.trim());

[dschuyler, 2016/10/18 19:10:58]

I considered shortening these to just test 
that it says 'Allow' (or similar), but then 
that's essentially testing the $i18n{} 
replacement, which I felt was unnecessary here.
Though I'm good with adding them back if that 
would be more useful than I realized.

[Dan Beam, 2016/10/18 19:24:15]

nah, just remove, IMO

 
               assertFalse(testElement.$.category.hidden);
               browserProxy.resetResolver('getExceptionList');
               testElement.categoryEnabled = false;
               return browserProxy.whenCalled('getExceptionList');
             }).then(function(contentType) {
               assertFalse(testElement.$.category.hidden);
-              assertEquals('Exceptions - 0',
-                  testElement.$.header.innerText.trim());
             });
       });
 
       test('initial ALLOW state is correct', function() {
         setupCategory(settings.ContentSettingsTypes.GEOLOCATION,
             settings.PermissionValues.ALLOW, prefs);
         return browserProxy.whenCalled('getExceptionList').then(
             function(contentType) {
               assertEquals(
                   settings.ContentSettingsTypes.GEOLOCATION, contentType);
 
               assertEquals(2, testElement.sites.length);
               assertEquals(prefs.exceptions.geolocation[1].origin,
                   testElement.sites[0].origin);
               assertEquals(
                   settings.PermissionValues.ALLOW, testElement.categorySubtype);
               Polymer.dom.flush();  // Populates action menu.
               openActionMenu(0);
               assertMenu(['Block', 'Remove'], testElement);
-              assertEquals('Allow - 2', testElement.$.header.innerText.trim());
 
               // Site list should show, no matter what category default is set
               // to.
               assertFalse(testElement.$.category.hidden);
               browserProxy.resetResolver('getExceptionList');
               testElement.categoryEnabled = false;
               return browserProxy.whenCalled('getExceptionList');
             }).then(function(contentType) {
               assertFalse(testElement.$.category.hidden);
-              assertEquals('Exceptions - 2',
-                  testElement.$.header.innerText.trim());
             });
       });
 
       test('initial BLOCK state is correct', function() {
         setupCategory(settings.ContentSettingsTypes.GEOLOCATION,
             settings.PermissionValues.BLOCK, prefs);
         return browserProxy.whenCalled('getExceptionList').then(
             function(contentType) {
               assertEquals(
                   settings.ContentSettingsTypes.GEOLOCATION, contentType);
 
               assertEquals(2, testElement.sites.length);
               assertEquals(prefs.exceptions.geolocation[3].origin,
                   testElement.sites[0].origin);
 
               assertEquals(
                   settings.PermissionValues.BLOCK, testElement.categorySubtype);
               Polymer.dom.flush();  // Populates action menu.
               openActionMenu(0);
               assertMenu(['Allow', 'Remove'], testElement);
-              assertEquals('Block - 2', testElement.$.header.innerText.trim());
 
               // Site list should only show when category default is enabled.
               assertFalse(testElement.$.category.hidden);
               browserProxy.resetResolver('getExceptionList');
               testElement.categoryEnabled = false;
               return browserProxy.whenCalled('getExceptionList');
             }).then(function(contentType) {
               assertTrue(testElement.$.category.hidden);
             });
       });
 
       test('initial SESSION ONLY state is correct', function() {
         setupCategory(settings.ContentSettingsTypes.COOKIES,
             settings.PermissionValues.SESSION_ONLY, prefsSessionOnly);
         return browserProxy.whenCalled('getExceptionList').then(
             function(contentType) {
               assertEquals(
                   settings.ContentSettingsTypes.COOKIES, contentType);
 
               assertEquals(1, testElement.sites.length);
               assertEquals(prefsSessionOnly.exceptions.cookies[2].origin,
                   testElement.sites[0].origin);
 
               assertEquals(settings.PermissionValues.SESSION_ONLY,
                   testElement.categorySubtype);
               Polymer.dom.flush();  // Populates action menu.
               openActionMenu(0);
               assertMenu(['Allow', 'Block', 'Remove'], testElement);
-              assertEquals('Clear on exit - 1',
-                  testElement.$.header.innerText.trim());
 
               // Site list should show, no matter what category default is set
               // to.
               assertFalse(testElement.$.category.hidden);
               browserProxy.resetResolver('getExceptionList');
               testElement.categoryEnabled = false;
               return browserProxy.whenCalled('getExceptionList');
             }).then(function(contentType) {
               assertFalse(testElement.$.category.hidden);
-              assertEquals('Clear on exit - 1', testElement.$.header.innerText);
             });
       });
 
       test('initial INCOGNITO BLOCK state is correct', function() {
         setupCategory(settings.ContentSettingsTypes.COOKIES,
             settings.PermissionValues.BLOCK, prefsIncognito);
         return browserProxy.whenCalled('getExceptionList').then(
             function(contentType) {
               assertEquals(settings.ContentSettingsTypes.COOKIES, contentType);
 
               assertEquals(1, testElement.sites.length);
               assertEquals(prefsIncognito.exceptions.cookies[0].origin,
                   testElement.sites[0].origin);
 
               assertEquals(settings.PermissionValues.BLOCK,
                   testElement.categorySubtype);
               Polymer.dom.flush();  // Populates action menu.
               openActionMenu(0);
               // 'Clear on exit' is visible as this is not an incognito item.
               assertMenu(['Allow', 'Clear on exit', 'Remove'], testElement);
-              assertEquals('Block - 1',
-                  testElement.$.header.innerText.trim());
 
               // Select 'Remove from menu'.
               var menuItems = getMenuItems(testElement.$.listContainer, 0);
               assertTrue(!!menuItems);
               MockInteractions.tap(menuItems[2]);
               return browserProxy.whenCalled(
                   'resetCategoryPermissionForOrigin');
             }).then(function(args) {
               assertEquals('http://foo.com', args[0]);
               assertEquals('http://foo.com', args[1]);
@@ skipping 15 matching lines @@
                   testElement.sites[0].origin);
               assertEquals(prefsIncognito.exceptions.cookies[1].origin,
                   testElement.sites[1].origin);
 
               assertEquals(settings.PermissionValues.ALLOW,
                   testElement.categorySubtype);
               Polymer.dom.flush();  // Populates action menu.
               openActionMenu(0);
               // 'Clear on exit' is hidden for incognito items.
               assertMenu(['Block', 'Remove'], testElement);
-              assertEquals('Allow - 2',
-                  testElement.$.header.innerText.trim());
 
               // Select 'Remove' from menu on 'foo.com'.
               openActionMenu(1);
               var menuItems = getMenuItems(testElement.$.listContainer, 1);
               assertTrue(!!menuItems);
               MockInteractions.tap(menuItems[1]);
               return browserProxy.whenCalled(
                   'resetCategoryPermissionForOrigin');
             }).then(function(args) {
               assertEquals('http://foo.com', args[0]);
@@ skipping 253 matching lines @@
           assertEquals(settings.ContentSettingsTypes.JAVASCRIPT, args[2]);
           assertEquals('allow', args[3]);
         });
       });
     });
   }
   return {
     registerTests: registerTests,
   };
 });