This fixes the failing policy_prefs_ui tests testTogglePolicyTogglesBanner and...

This fixes the failing policy_prefs_ui tests testTogglePolicyTogglesBanner and testPoliciesShowBanner and re-enables these tests.

BUG=102546
TEST=policy_prefs_ui

Review URL: http://codereview.chromium.org/8423031

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108230 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/resources/options/options_page.js

@@ -857,7 +857,7 @@ cr.define('options', function() {
 
       var controlledByPolicy = false;
       var controlledByExtension = false;
-      var inputElements = this.pageDiv.querySelectorAll('input[controlledBy]');
+      var inputElements = this.pageDiv.querySelectorAll('input[controlled-by]');
       for (var i = 0, len = inputElements.length; i < len; i++) {
         if (inputElements[i].controlledBy == 'policy')
           controlledByPolicy = true;

chrome/test/functional/PYAUTO_TESTS

@@ -118,9 +118,6 @@
       '-plugins.PluginsTest.testAllowPluginException',
       # crbug.com/85307
       '-plugins.PluginsTest.testKillAndReloadAllPlugins',
-      # crbug.com/102546
-      '-policy_prefs_ui.PolicyPrefsUITest.testPoliciesShowBanner',
-      '-policy_prefs_ui.PolicyPrefsUITest.testTogglePolicyTogglesBanner',
       # crbug.com/88574
       '-special_tabs.SpecialTabsTest.testSpecialURLTabs',
       # crbug.com/88593