summaryrefslogtreecommitdiffstats
path: root/chrome/test/ppapi
diff options
context:
space:
mode:
authornfullagar@google.com <nfullagar@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-08 23:57:26 +0000
committernfullagar@google.com <nfullagar@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-08 23:57:26 +0000
commitba070d40848f9bbe35b1b1c37e382a41dedbe35a (patch)
tree11f8bf6ddee851374b1c123fc0629b4c41b0a464 /chrome/test/ppapi
parent6010e91c54fd2a0ff380bad292dd6fba27a3440e (diff)
downloadchromium_src-ba070d40848f9bbe35b1b1c37e382a41dedbe35a.zip
chromium_src-ba070d40848f9bbe35b1b1c37e382a41dedbe35a.tar.gz
chromium_src-ba070d40848f9bbe35b1b1c37e382a41dedbe35a.tar.bz2
Enable ppapi image data test for NaCl.
BUG=130377 TEST=chrome/ppapi/tests/test_image_data.cc Review URL: https://chromiumcodereview.appspot.com/10823211 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150638 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ppapi')
-rw-r--r--chrome/test/ppapi/ppapi_browsertest.cc5
1 files changed, 1 insertions, 4 deletions
diff --git a/chrome/test/ppapi/ppapi_browsertest.cc b/chrome/test/ppapi/ppapi_browsertest.cc
index 06b922b..286c17e 100644
--- a/chrome/test/ppapi/ppapi_browsertest.cc
+++ b/chrome/test/ppapi/ppapi_browsertest.cc
@@ -206,10 +206,7 @@ TEST_PPAPI_NACL_VIA_HTTP(Graphics3D)
TEST_PPAPI_IN_PROCESS(ImageData)
TEST_PPAPI_OUT_OF_PROCESS(ImageData)
-
-// PPAPINaClTest.ImageData times out consistently on all platforms.
-// http://crbug.com/130377
-TEST_PPAPI_NACL_VIA_HTTP(DISABLED_ImageData)
+TEST_PPAPI_NACL_VIA_HTTP(ImageData)
TEST_PPAPI_IN_PROCESS(BrowserFont)
TEST_PPAPI_OUT_OF_PROCESS(BrowserFont)