Partial revert of 146621

ui/compositor/layer.h

Index: ui/compositor/layer.h
diff --git a/ui/compositor/layer.h b/ui/compositor/layer.h
index bc16ee1fe16314603e1cb03e0f5de95fd38cefde..4eb39cf88cace356c276882c5d7f9fa52a07c5c6 100644
--- a/ui/compositor/layer.h
+++ b/ui/compositor/layer.h
@@ -13,7 +13,6 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebContentLayerClient.h"
-#include "third_party/WebKit/Source/Platform/chromium/public/WebExternalTextureLayerClient.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayer.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkRegion.h"
@@ -44,8 +43,7 @@ class Texture;
 // NULL, but the children are not deleted.
 class COMPOSITOR_EXPORT Layer
     : public LayerAnimationDelegate,
-      NON_EXPORTED_BASE(public WebKit::WebContentLayerClient),
-      NON_EXPORTED_BASE(public WebKit::WebExternalTextureLayerClient) {
+      NON_EXPORTED_BASE(public WebKit::WebContentLayerClient) {
  public:
   Layer();
   explicit Layer(LayerType type);
@@ -262,11 +260,6 @@ class COMPOSITOR_EXPORT Layer
 
   WebKit::WebLayer web_layer() { return web_layer_; }
 
-  // WebExternalTextureLayerClient
-  virtual unsigned prepareTexture(
-      WebKit::WebTextureUpdater& /* updater */) OVERRIDE;
-  virtual WebKit::WebGraphicsContext3D* context() OVERRIDE;
-
   float device_scale_factor() const { return device_scale_factor_; }
 
   // Forces a render surface to be used on this layer. This has no positive