Android: Put common native VideoFrameBuffer implementation in androidvideocapturer_jni

talk/app/webrtc/java/jni/androidvideocapturer_jni.cc

Index: talk/app/webrtc/java/jni/androidvideocapturer_jni.cc
diff --git a/talk/app/webrtc/java/jni/androidvideocapturer_jni.cc b/talk/app/webrtc/java/jni/androidvideocapturer_jni.cc
index 45396b6e8375a305681ec6ef51eaae5d83826fe1..6d4891ee596672bd50e37c4f87148a9169a7e995 100644
--- a/talk/app/webrtc/java/jni/androidvideocapturer_jni.cc
+++ b/talk/app/webrtc/java/jni/androidvideocapturer_jni.cc
@@ -34,34 +34,6 @@
 
 namespace webrtc_jni {
 
-namespace {
-
-class CameraTextureBuffer : public webrtc::NativeHandleBuffer {
- public:
-  CameraTextureBuffer(int width, int height,
-      const NativeHandleImpl& native_handle,
-      const rtc::Callback0<void>& no_longer_used)
-      : webrtc::NativeHandleBuffer(&native_handle_, width, height),
-        native_handle_(native_handle),
-        no_longer_used_cb_(no_longer_used) {}
-
-  ~CameraTextureBuffer() {
-    no_longer_used_cb_();
-  }
-
-  rtc::scoped_refptr<VideoFrameBuffer> NativeToI420Buffer() override {
-    RTC_NOTREACHED()
-        << "CameraTextureBuffer::NativeToI420Buffer not implemented.";
-    return nullptr;
-  }
-
- private:
-  NativeHandleImpl native_handle_;
-  rtc::Callback0<void> no_longer_used_cb_;
-};
-
-}  // anonymous namespace
-
 jobject AndroidVideoCapturerJni::application_context_ = nullptr;
 
 // static
@@ -213,7 +185,7 @@ void AndroidVideoCapturerJni::OnTextureFrame(int width,
                                              int64_t timestamp_ns,
                                              const NativeHandleImpl& handle) {
   rtc::scoped_refptr<webrtc::VideoFrameBuffer> buffer(
-      new rtc::RefCountedObject<CameraTextureBuffer>(
+      new rtc::RefCountedObject<AndroidTextureBuffer>(
           width, height, handle,
           rtc::Bind(&AndroidVideoCapturerJni::ReturnBuffer, this,
                     timestamp_ns)));