Convert SiteSettingsCategory to use the HostContentSettingsMap instead of

chrome/test/data/webui/settings/site_settings_category_tests.js

Index: chrome/test/data/webui/settings/site_settings_category_tests.js
diff --git a/chrome/test/data/webui/settings/site_settings_category_tests.js b/chrome/test/data/webui/settings/site_settings_category_tests.js
index c82f668c5a9613bc2f1a7bfdd6a68ab470bbd56c..14e70e1c04da1a248424783f650fa44f88c0274a 100644
--- a/chrome/test/data/webui/settings/site_settings_category_tests.js
+++ b/chrome/test/data/webui/settings/site_settings_category_tests.js
@@ -40,6 +40,17 @@ cr.define('site_settings_category', function() {
 
       // Import necessary html before running suite.
       suiteSetup(function() {
+        cr.define('settings_test', function() {
+          var changeCategoryOptions = {
+            /**
+             * True if property changes should fire events for testing purposes.
+             * @type {boolean}
+             */
+            notifyPropertyChangesForTest: true,
+          };
+          return {changeCategoryOptions: changeCategoryOptions};
+        });
+
         return PolymerTest.importHtml(
            'chrome://md-settings/site_settings/site_settings_category.html');
       });
@@ -51,18 +62,50 @@ cr.define('site_settings_category', function() {
         document.body.appendChild(testElement);
       });
 
-      test('categoryEnabled correctly represents prefs', function() {
+      /**
+       * Returns a promise that resolves once the selected item is updated.
+       * @param {function()} action is executed after the listener is set up.
+       * @return {!Promise} a Promise fulfilled when the selected item changes.
+       */
+      function runAndResolveWhenCategoryEnabledChanged(action) {
+        return new Promise(function(resolve, reject) {
+          var handler = function() {
+            testElement.removeEventListener(
+                'category-enabled-changed', handler);
+            resolve();
+          };
+          testElement.addEventListener('category-enabled-changed', handler);
+          action();
+        });
+      }
+
+      test('categoryEnabled correctly represents prefs (enabled)', function() {
         testElement.category = settings.ContentSettingsTypes.GEOLOCATION;
 
-        testElement.prefs = prefsLocationEnabled;
-        assertTrue(testElement.categoryEnabled);
-        MockInteractions.tap(testElement.$.toggle);
-        assertFalse(testElement.categoryEnabled);
+        return runAndResolveWhenCategoryEnabledChanged(function() {
+          testElement.prefs = prefsLocationEnabled;
+        }).then(function() {
+          assertTrue(testElement.categoryEnabled);
+          MockInteractions.tap(testElement.$.toggle);
+          assertFalse(testElement.categoryEnabled);
+        });
+      });
+
+      test('categoryEnabled correctly represents prefs (disabled)', function() {
+        testElement.category = settings.ContentSettingsTypes.GEOLOCATION;
 
-        testElement.prefs = prefsLocationDisabled;
-        assertFalse(testElement.categoryEnabled);
-        MockInteractions.tap(testElement.$.toggle);
-        assertTrue(testElement.categoryEnabled);
+        // In order for the 'change' event to trigger, the value monitored needs
+        // to actually change (the event is not sent otherwise). Therefore,
+        // ensure the initial state of enabledness is opposite of what we expect
+        // it to end at.
+        testElement.categoryEnabled = true;
+        return runAndResolveWhenCategoryEnabledChanged(function() {
+          testElement.prefs = prefsLocationDisabled;
+        }).then(function() {
+          assertFalse(testElement.categoryEnabled);
+          MockInteractions.tap(testElement.$.toggle);
+          assertTrue(testElement.categoryEnabled);

[tommycli, 2016/02/18 22:15:19]

These should be expect instead of assert right?

[Finnur, 2016/02/19 10:18:13]

To me, 'expect' is appropriate if the test can continue and still give you
meaningful results. The problem here is that if the enabled state is wrong to
begin with, then continuing is not going to be helpful.

I don't feel strongly, though, so feel free to convince me otherwise for a
follow-up CL.

+        });
       });
 
       test('basic category tests', function() {