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

cc/test/tiled_layer_test_common.cc

Index: cc/test/tiled_layer_test_common.cc
diff --git a/cc/test/tiled_layer_test_common.cc b/cc/test/tiled_layer_test_common.cc
index 12d50c7393e543eb5cc88d4ba44301f31b487acb..6c5a83a44fc11fc4435acf50a9e8b34ca9560009 100644
--- a/cc/test/tiled_layer_test_common.cc
+++ b/cc/test/tiled_layer_test_common.cc
@@ -64,7 +64,7 @@ PassOwnPtr<LayerTextureUpdater::Texture> FakeLayerTextureUpdater::createTexture(
     return adoptPtr(new Texture(this, CCPrioritizedTexture::create(manager)));
 }
 
-LayerTextureUpdater::SampledTexelFormat FakeLayerTextureUpdater::sampledTexelFormat(GC3Denum)
+LayerTextureUpdater::SampledTexelFormat FakeLayerTextureUpdater::sampledTexelFormat(GLenum)
 {
     return SampledTexelFormatRGBA;
 }
@@ -84,7 +84,7 @@ FakeTiledLayerChromium::FakeTiledLayerChromium(CCPrioritizedTextureManager* text
     , m_textureManager(textureManager)
 {
     setTileSize(tileSize());
-    setTextureFormat(GraphicsContext3D::RGBA);
+    setTextureFormat(GL_RGBA);
     setBorderTexelOption(CCLayerTilingData::NoBorderTexels);
     setIsDrawable(true); // So that we don't get false positives if any of these tests expect to return false from drawsContent() for other reasons.
 }