MD Settings: fix policy indicator rendering bug in <controlled-button>

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

Index: chrome/test/data/webui/settings/controlled_button_tests.js
diff --git a/chrome/test/data/webui/settings/controlled_button_tests.js b/chrome/test/data/webui/settings/controlled_button_tests.js
index 7b37046f9779d0a44bb81a51570543d169baa393..3a66529d9f39159f04abb40a1da47e5175e9b5d9 100644
--- a/chrome/test/data/webui/settings/controlled_button_tests.js
+++ b/chrome/test/data/webui/settings/controlled_button_tests.js
@@ -4,34 +4,54 @@
 
 suite('controlled button', function() {
   /** @type {ControlledButtonElement} */
-  var button;
+  var controlledButton;
 
   /** @type {!chrome.settingsPrivate.PrefObject} */
-  var pref = {
+  var uncontrolledPref = {
     key: 'test',
     type: chrome.settingsPrivate.PrefType.BOOLEAN,
     value: true
   };
 
+  /** @type {!chrome.settingsPrivate.PrefObject} */
+  var extensionControlledPref = Object.assign({
+    controlledBy: chrome.settingsPrivate.ControlledBy.EXTENSION,
+    enforcement: chrome.settingsPrivate.Enforcement.ENFORCED,
+  }, uncontrolledPref);
+
+  /** @type {!chrome.settingsPrivate.PrefObject} */
+  var policyControlledPref = Object.assign({
+    controlledBy: chrome.settingsPrivate.ControlledBy.USER_POLICY,
+    enforcement: chrome.settingsPrivate.Enforcement.ENFORCED,
+  }, uncontrolledPref);
+
   setup(function() {
     PolymerTest.clearBody();
-    button = document.createElement('controlled-button');
-    button.pref = pref;
-    document.body.appendChild(button);
+    controlledButton = document.createElement('controlled-button');
+    controlledButton.pref = uncontrolledPref;
+    document.body.appendChild(controlledButton);
+    Polymer.dom.flush();
   });
 
-  test('disables when pref is managed', function() {
-    button.set('pref.enforcement', chrome.settingsPrivate.Enforcement.ENFORCED);
+  test('controlled prefs', function() {
+    assertFalse(controlledButton.$$('paper-button').disabled);
+    assertFalse(!!controlledButton.$$('cr-policy-pref-indicator'));
+
+    controlledButton.pref = extensionControlledPref;
     Polymer.dom.flush();
-    assertTrue(button.$$('paper-button').disabled);
+    assertTrue(controlledButton.$$('paper-button').disabled);
+    assertFalse(!!controlledButton.$$('cr-policy-pref-indicator'));
 
-    var indicator = button.$$('cr-policy-pref-indicator');
+    controlledButton.pref = policyControlledPref;
+    Polymer.dom.flush();
+    assertTrue(controlledButton.$$('paper-button').disabled);
+    var indicator = controlledButton.$$('cr-policy-pref-indicator');
     assertTrue(!!indicator);
     assertGT(indicator.clientHeight, 0);
 
-    button.set('pref.enforcement', undefined);
+    controlledButton.pref = uncontrolledPref;
     Polymer.dom.flush();
-    assertFalse(button.$$('paper-button').disabled);
-    assertEquals(0, indicator.clientHeight);
+    assertFalse(controlledButton.$$('paper-button').disabled);
+    assertFalse(!!controlledButton.$$('cr-policy-pref-indicator'));
   });
 });