Revert of Make Android StreamTexture implement GLStreamTextureImage

content/common/gpu/stream_texture_android.h

Index: content/common/gpu/stream_texture_android.h
diff --git a/content/common/gpu/stream_texture_android.h b/content/common/gpu/stream_texture_android.h
index 8852965df333f68c86897da3d05e91e8984455e2..e19fc1b321a23cff8c83892b195c7517fa2113e7 100644
--- a/content/common/gpu/stream_texture_android.h
+++ b/content/common/gpu/stream_texture_android.h
@@ -10,7 +10,6 @@
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "content/common/gpu/gpu_command_buffer_stub.h"
-#include "gpu/command_buffer/service/gl_stream_texture_image.h"
 #include "ipc/ipc_listener.h"
 #include "ui/gl/android/surface_texture.h"
 #include "ui/gl/gl_image.h"
@@ -25,7 +24,7 @@
 
 namespace content {
 
-class StreamTexture : public gpu::gles2::GLStreamTextureImage,
+class StreamTexture : public gl::GLImage,
                       public IPC::Listener,
                       public GpuCommandBufferStub::DestructionObserver {
  public:
@@ -58,9 +57,6 @@
                     uint64_t process_tracing_id,
                     const std::string& dump_name) override;
 
-  // gpu::gles2::GLStreamTextureMatrix implementation
-  void GetTextureMatrix(float xform[16]) override;
-
   // GpuCommandBufferStub::DestructionObserver implementation.
   void OnWillDestroyStub() override;
 
@@ -87,6 +83,9 @@
   // Current size of the surface texture.
   gfx::Size size_;
 
+  // Whether we ever bound a valid frame.
+  bool has_valid_frame_;
+
   // Whether a new frame is available that we should update to.
   bool has_pending_frame_;