| Index: ui/gl/test/gl_image_test_template.h
|
| diff --git a/ui/gl/test/gl_image_test_template.h b/ui/gl/test/gl_image_test_template.h
|
| index 09b451c5b3c9491ae1d308ebf418498c9476b465..75c98c0cd85854135b517c0cc06183eef442e534 100644
|
| --- a/ui/gl/test/gl_image_test_template.h
|
| +++ b/ui/gl/test/gl_image_test_template.h
|
| @@ -169,9 +169,7 @@ class GLImageZeroInitializeTest : public GLImageTest<GLImageTestDelegate> {};
|
| // result is zero-initialized.
|
| TYPED_TEST_CASE_P(GLImageZeroInitializeTest);
|
|
|
| -// TODO(erikchen): Enable this test when it actually passes on Mac.
|
| -// https://crbug.com/584760.
|
| -TYPED_TEST_P(GLImageZeroInitializeTest, DISABLED_ZeroInitialize) {
|
| +TYPED_TEST_P(GLImageZeroInitializeTest, ZeroInitialize) {
|
| const gfx::Size image_size(256, 256);
|
| scoped_refptr<gl::GLImage> image = this->delegate_.CreateImage(image_size);
|
| GLenum target = this->delegate_.GetTextureTarget();
|
| @@ -205,7 +203,7 @@ TYPED_TEST_P(GLImageZeroInitializeTest, DISABLED_ZeroInitialize) {
|
| glDeleteTextures(1, &uninitialized_texture);
|
| }
|
|
|
| -REGISTER_TYPED_TEST_CASE_P(GLImageZeroInitializeTest, DISABLED_ZeroInitialize);
|
| +REGISTER_TYPED_TEST_CASE_P(GLImageZeroInitializeTest, ZeroInitialize);
|
|
|
| template <typename GLImageTestDelegate>
|
| class GLImageCopyTest : public GLImageTest<GLImageTestDelegate> {};
|
|
|