Merge from Chromium at DEPS revision 30.0.1599.85
This commit was generated by merge_to_master.py.
Change-Id: I449d60b3d7547648d4a6871c352653a8a17d57b5
diff --git a/tests.gyp b/tests.gyp
index 916f3e2..0a53617 100644
--- a/tests.gyp
+++ b/tests.gyp
@@ -34,7 +34,7 @@
'../tests/BlitRowTest.cpp',
'../tests/BlurTest.cpp',
'../tests/CanvasTest.cpp',
- '../tests/CanvasStateTest.cpp',
+# '../tests/CanvasStateTest.cpp',
'../tests/ChecksumTest.cpp',
'../tests/ClampRangeTest.cpp',
'../tests/ClipCacheTest.cpp',