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

cc/test/tiled_layer_test_common.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 "CCTiledLayerTestCommon.h"
 
 using namespace cc;
 
@@ skipping 46 matching lines @@
 {
     m_rectToInvalidate = rect;
     m_layer = layer;
 }
 
 PassOwnPtr<LayerTextureUpdater::Texture> FakeLayerTextureUpdater::createTexture(CCPrioritizedTextureManager* manager)
 {
     return adoptPtr(new Texture(this, CCPrioritizedTexture::create(manager)));
 }
 
-LayerTextureUpdater::SampledTexelFormat FakeLayerTextureUpdater::sampledTexelFormat(GC3Denum)
+LayerTextureUpdater::SampledTexelFormat FakeLayerTextureUpdater::sampledTexelFormat(GLenum)
 {
     return SampledTexelFormatRGBA;
 }
 
 FakeCCTiledLayerImpl::FakeCCTiledLayerImpl(int id)
     : CCTiledLayerImpl(id)
 {
 }
 
 FakeCCTiledLayerImpl::~FakeCCTiledLayerImpl()
 {
 }
 
 FakeTiledLayerChromium::FakeTiledLayerChromium(CCPrioritizedTextureManager* textureManager)
     : TiledLayerChromium()
     , m_fakeTextureUpdater(adoptRef(new FakeLayerTextureUpdater))
     , 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.
 }
 
 FakeTiledLayerWithScaledBounds::FakeTiledLayerWithScaledBounds(CCPrioritizedTextureManager* textureManager)
     : FakeTiledLayerChromium(textureManager)
 {
 }
 
 FakeTiledLayerWithScaledBounds::~FakeTiledLayerWithScaledBounds()
@@ skipping 55 matching lines @@
 {
     upload.texture->acquireBackingTexture(resourceProvider);
 }
 
 double FakeTextureUploader::estimatedTexturesPerSecond()
 {
     return std::numeric_limits<double>::max();
 }
 
 } // namespace