summaryrefslogtreecommitdiffstats
path: root/chrome/test/functional
diff options
context:
space:
mode:
authorjoaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-08 11:00:56 +0000
committerjoaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-08 11:00:56 +0000
commitb269018db8cb23069d14c44b9883552857f9f55c (patch)
treeb1bba713b0c871d2a051206abe168975cc3f3fdf /chrome/test/functional
parent2925af81270b8b63f21200c10e24a8bd948cf72c (diff)
downloadchromium_src-b269018db8cb23069d14c44b9883552857f9f55c.zip
chromium_src-b269018db8cb23069d14c44b9883552857f9f55c.tar.gz
chromium_src-b269018db8cb23069d14c44b9883552857f9f55c.tar.bz2
Fixed enterprise.EnterpriseTest.testDisabled3DAPI.
BUG=95141 TEST=enterprise.EnterpriseTest.testDisabled3DAPI Review URL: http://codereview.chromium.org/8484006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109007 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/functional')
-rw-r--r--chrome/test/functional/PYAUTO_TESTS2
-rw-r--r--chrome/test/functional/enterprise.py2
2 files changed, 1 insertions, 3 deletions
diff --git a/chrome/test/functional/PYAUTO_TESTS b/chrome/test/functional/PYAUTO_TESTS
index 7eed8fe..133d1e7 100644
--- a/chrome/test/functional/PYAUTO_TESTS
+++ b/chrome/test/functional/PYAUTO_TESTS
@@ -480,8 +480,6 @@
# ==================================================
# crbug.com/101787
'-enterprise.EnterpriseTestReverse.testDefaultSearchProviderDisabled',
- # crbug.com/95141
- '-enterprise.EnterpriseTest.testDisable3DAPI',
# crbug.com/98500
'-enterprise.EnterpriseTestReverse.testAlwaysAuthorizePluginsDisabled',
# crbug.com/96896
diff --git a/chrome/test/functional/enterprise.py b/chrome/test/functional/enterprise.py
index 18f2f25..86e78d8 100644
--- a/chrome/test/functional/enterprise.py
+++ b/chrome/test/functional/enterprise.py
@@ -370,7 +370,7 @@ class EnterpriseTest(pyauto.PyUITest):
if self.GetBrowserInfo()['properties']['branding'] != 'Google Chrome':
return
- self._CheckIfPrefCanBeModified(pyauto.kDisable3DAPIs, True, False)
+ self._CheckIfPrefCanBeModified(pyauto.kDisable3DAPIs, False, True)
self.assertEqual(self.GetDOMValue('document.createElement("canvas").' +
'getContext("experimental-webgl")' +
'== null ? "ok" : ""'), 'ok')