android: Remove in-process video path

gpu/command_buffer/client/gl_in_process_context.cc

 // Copyright (c) 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 "gpu/command_buffer/client/gl_in_process_context.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <set>
@@ skipping 53 matching lines @@
                   gfx::GpuPreference gpu_preference,
                   const scoped_refptr<InProcessCommandBuffer::Service>& service,
                   GpuMemoryBufferManager* gpu_memory_buffer_manager,
                   ImageFactory* image_factory);
 
   // GLInProcessContext implementation:
   gles2::GLES2Implementation* GetImplementation() override;
   size_t GetMappedMemoryLimit() override;
   void SetLock(base::Lock* lock) override;
 
-#if defined(OS_ANDROID)
-  scoped_refptr<gfx::SurfaceTexture> GetSurfaceTexture(
-      uint32_t stream_id) override;
-  uint32_t CreateStreamTexture(uint32_t texture_id) override;
-#endif
-
  private:
   void Destroy();
   void OnSignalSyncPoint(const base::Closure& callback);
 
   scoped_ptr<gles2::GLES2CmdHelper> gles2_helper_;
   scoped_ptr<TransferBuffer> transfer_buffer_;
   scoped_ptr<gles2::GLES2Implementation> gles2_implementation_;
   scoped_ptr<InProcessCommandBuffer> command_buffer_;
 
   const GLInProcessContextSharedMemoryLimits mem_limits_;
@@ skipping 110 matching lines @@
     gles2_implementation_->Flush();
 
     gles2_implementation_.reset();
   }
 
   transfer_buffer_.reset();
   gles2_helper_.reset();
   command_buffer_.reset();
 }
 
+/*
 #if defined(OS_ANDROID)

[no sievers, 2016/04/18 23:00:50]

you forgot to remove this block after commenting it out

[boliu, 2016/04/18 23:05:06]

Oops, removed

 scoped_refptr<gfx::SurfaceTexture> GLInProcessContextImpl::GetSurfaceTexture(
     uint32_t stream_id) {
   return command_buffer_->GetSurfaceTexture(stream_id);
 }
 
 uint32_t GLInProcessContextImpl::CreateStreamTexture(uint32_t texture_id) {
   return command_buffer_->CreateStreamTexture(texture_id);
 }
 #endif
+*/
 
 }  // anonymous namespace
 
 GLInProcessContextSharedMemoryLimits::GLInProcessContextSharedMemoryLimits()
     : command_buffer_size(kDefaultCommandBufferSize),
       start_transfer_buffer_size(kDefaultStartTransferBufferSize),
       min_transfer_buffer_size(kDefaultMinTransferBufferSize),
       max_transfer_buffer_size(kDefaultMaxTransferBufferSize),
       mapped_memory_reclaim_limit(gles2::GLES2Implementation::kNoLimit) {
 }
@@ skipping 28 matching lines @@
                            gpu_preference,
                            service,
                            gpu_memory_buffer_manager,
                            image_factory))
     return NULL;
 
   return context.release();
 }
 
 }  // namespace gpu