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

cc/test/tiled_layer_test_common.h

 // 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.
 
 #ifndef CCTiledLayerTestCommon_h
 #define CCTiledLayerTestCommon_h
 
 #include "CCGraphicsContext.h"
 #include "CCPrioritizedTexture.h"
 #include "CCResourceProvider.h"
@@ skipping 21 matching lines @@
         virtual void update(cc::CCTextureUpdateQueue&, const cc::IntRect&, const cc::IntSize&, bool, cc::CCRenderingStats&) OVERRIDE;
 
     private:
         FakeLayerTextureUpdater* m_layer;
     };
 
     FakeLayerTextureUpdater();
     virtual ~FakeLayerTextureUpdater();
 
     virtual PassOwnPtr<cc::LayerTextureUpdater::Texture> createTexture(cc::CCPrioritizedTextureManager*) OVERRIDE;
-    virtual SampledTexelFormat sampledTexelFormat(GC3Denum) OVERRIDE;
+    virtual SampledTexelFormat sampledTexelFormat(GLenum) OVERRIDE;
 
     virtual void prepareToUpdate(const cc::IntRect& contentRect, const cc::IntSize&, float, float, cc::IntRect& resultingOpaqueRect, cc::CCRenderingStats&) OVERRIDE;
     // Sets the rect to invalidate during the next call to prepareToUpdate(). After the next
     // call to prepareToUpdate() the rect is reset.
     void setRectToInvalidate(const cc::IntRect&, FakeTiledLayerChromium*);
     // Last rect passed to prepareToUpdate().
     const cc::IntRect& lastUpdateRect()  const { return m_lastUpdateRect; }
 
     // Number of times prepareToUpdate has been invoked.
     int prepareCount() const { return m_prepareCount; }
@@ skipping 72 matching lines @@
 class FakeTextureUploader : public cc::TextureUploader {
 public:
     virtual size_t numBlockingUploads() OVERRIDE;
     virtual void markPendingUploadsAsNonBlocking() OVERRIDE;
     virtual double estimatedTexturesPerSecond() OVERRIDE;
     virtual void uploadTexture(cc::CCResourceProvider*, Parameters) OVERRIDE;
 };
 
 }
 #endif // CCTiledLayerTestCommon_h