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

cc/layer_tree_host.h

 // Copyright 2011 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 CCLayerTreeHost_h
 #define CCLayerTreeHost_h
 
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
 #include "base/memory/ref_counted.h"
@@ skipping 57 matching lines @@
 
     bool showDebugInfo() const { return showPlatformLayerTree || showFPSCounter || showDebugRects(); }
     bool showDebugRects() const { return showPaintRects || showPropertyChangedRects || showSurfaceDamageRects || showScreenSpaceRects || showReplicaScreenSpaceRects || showOccludingRects; }
 };
 
 // Provides information on an Impl's rendering capabilities back to the CCLayerTreeHost
 struct RendererCapabilities {
     RendererCapabilities();
     ~RendererCapabilities();
 
-    GC3Denum bestTextureFormat;
+    GLenum bestTextureFormat;
     bool contextHasCachedFrontBuffer;
     bool usingPartialSwap;
     bool usingAcceleratedPainting;
     bool usingSetVisibility;
     bool usingSwapCompleteCallback;
     bool usingGpuMemoryManager;
     bool usingDiscardFramebuffer;
     bool usingEglImage;
     int maxTextureSize;
 };
@@ skipping 183 matching lines @@
     size_t m_partialTextureUpdateRequests;
 
     static bool s_needsFilterContext;
 
     DISALLOW_COPY_AND_ASSIGN(CCLayerTreeHost);
 };
 
 }  // namespace cc
 
 #endif