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

cc/tiled_layer_impl.cc

Index: cc/tiled_layer_impl.cc
diff --git a/cc/tiled_layer_impl.cc b/cc/tiled_layer_impl.cc
index 96dc09ad7e92be2a38d935c17868a12b7d1ea206..b2f1e5a1fca341e2a8079f5db266521f652d9a49 100644
--- a/cc/tiled_layer_impl.cc
+++ b/cc/tiled_layer_impl.cc
@@ -8,6 +8,7 @@
 
 #include "base/basictypes.h"
 #include "base/stringprintf.h"
+#include "third_party/khronos/GLES2/gl2.h"
 #include "CCAppendQuadsData.h"
 #include "CCCheckerboardDrawQuad.h"
 #include "CCDebugBorderDrawQuad.h"
@@ -17,7 +18,6 @@
 #include "CCSolidColorDrawQuad.h"
 #include "CCTileDrawQuad.h"
 #include "FloatQuad.h"
-#include "GraphicsContext3D.h"
 #include "SkColor.h"
 
 using namespace std;
@@ -194,7 +194,7 @@ void CCTiledLayerImpl::appendQuads(CCQuadSink& quadSink, CCAppendQuadsData& appe
             bool rightEdgeAA = i == m_tiler->numTilesX() - 1 && useAA;
             bool bottomEdgeAA = j == m_tiler->numTilesY() - 1 && useAA;
 
-            const GC3Dint textureFilter = m_tiler->hasBorderTexels() ? GraphicsContext3D::LINEAR : GraphicsContext3D::NEAREST;
+            const GLint textureFilter = m_tiler->hasBorderTexels() ? GL_LINEAR : GL_NEAREST;
             quadSink.append(CCTileDrawQuad::create(sharedQuadState, tileRect, tileOpaqueRect, tile->resourceId(), textureOffset, textureSize, textureFilter, contentsSwizzled(), leftEdgeAA, topEdgeAA, rightEdgeAA, bottomEdgeAA).PassAs<CCDrawQuad>(), appendQuadsData);
         }
     }