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

cc/draw_quad_unittest.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "CCDrawQuad.h"
 
 #include "CCCheckerboardDrawQuad.h"
 #include "CCDebugBorderDrawQuad.h"
@@ skipping 238 matching lines @@
     EXPECT_EQ(uvRect, copyQuad->uvRect());
     EXPECT_EQ(flipped, copyQuad->flipped());
 }
 
 TEST(CCDrawQuadTest, copyTileDrawQuad)
 {
     IntRect opaqueRect(33, 44, 22, 33);
     unsigned resourceId = 104;
     IntPoint textureOffset(-31, 47);
     IntSize textureSize(85, 32);
-    GC3Dint textureFilter = 82;
+    GLint textureFilter = 82;
     bool swizzleContents = true;
     bool leftEdgeAA = true;
     bool topEdgeAA = true;
     bool rightEdgeAA = false;
     bool bottomEdgeAA = true;
 
     CREATE_SHARED_STATE();
     CREATE_QUAD_10(CCTileDrawQuad, opaqueRect, resourceId, textureOffset, textureSize, textureFilter, swizzleContents, leftEdgeAA, topEdgeAA, rightEdgeAA, bottomEdgeAA);
     EXPECT_RECT_EQ(opaqueRect, copyQuad->opaqueRect());
     EXPECT_EQ(resourceId, copyQuad->resourceId());
@@ skipping 35 matching lines @@
     EXPECT_EQ(uPlane.size, copyQuad->uPlane().size);
     EXPECT_EQ(uPlane.format, copyQuad->uPlane().format);
     EXPECT_EQ(uPlane.visibleSize, copyQuad->uPlane().visibleSize);
     EXPECT_EQ(vPlane.resourceId, copyQuad->vPlane().resourceId);
     EXPECT_EQ(vPlane.size, copyQuad->vPlane().size);
     EXPECT_EQ(vPlane.format, copyQuad->vPlane().format);
     EXPECT_EQ(vPlane.visibleSize, copyQuad->vPlane().visibleSize);
 }
 
 } // namespace