Patch from https://codereview.chromium.org/11111005/ without actual file deletes

cc/texture_copier_unittest.cc

Index: cc/texture_copier_unittest.cc
diff --git a/cc/texture_copier_unittest.cc b/cc/texture_copier_unittest.cc
index 1c1fb1d5403fb66c37df0bc71ecaff089225c783..190b640cfea75d486713707c0051ea9194e49a95 100644
--- a/cc/texture_copier_unittest.cc
+++ b/cc/texture_copier_unittest.cc
@@ -6,10 +6,10 @@
 
 #include "TextureCopier.h"
 
-#include "FakeWebGraphicsContext3D.h"
-#include "GraphicsContext3D.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/khronos/GLES2/gl2.h"
+#include "FakeWebGraphicsContext3D.h"
 #include <wtf/RefPtr.h>
 
 using namespace cc;
@@ -34,20 +34,20 @@ TEST(TextureCopierTest, testDrawArraysCopy)
         InSequence sequence;
 
         // Here we check just some essential properties of copyTexture() to avoid mirroring the full implementation.
-        EXPECT_CALL(*mockContext, bindFramebuffer(GraphicsContext3D::FRAMEBUFFER, _));
+        EXPECT_CALL(*mockContext, bindFramebuffer(GL_FRAMEBUFFER, _));
 
         // Make sure linear filtering is disabled during the copy.
-        EXPECT_CALL(*mockContext, texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_MIN_FILTER, GraphicsContext3D::NEAREST));
-        EXPECT_CALL(*mockContext, texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_MAG_FILTER, GraphicsContext3D::NEAREST));
+        EXPECT_CALL(*mockContext, texParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST));
+        EXPECT_CALL(*mockContext, texParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST));
 
         EXPECT_CALL(*mockContext, drawArrays(_, _, _));
 
         // Linear filtering should be restored.
-        EXPECT_CALL(*mockContext, texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_MIN_FILTER, GraphicsContext3D::LINEAR));
-        EXPECT_CALL(*mockContext, texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_MAG_FILTER, GraphicsContext3D::LINEAR));
+        EXPECT_CALL(*mockContext, texParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR));
+        EXPECT_CALL(*mockContext, texParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR));
 
         // Default framebuffer should be restored
-        EXPECT_CALL(*mockContext, bindFramebuffer(GraphicsContext3D::FRAMEBUFFER, 0));
+        EXPECT_CALL(*mockContext, bindFramebuffer(GL_FRAMEBUFFER, 0));
     }
 
     int sourceTextureId = 1;