Add helper KeepRefUntilDone

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

 /*
  * libjingle
  * Copyright 2015 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 10 matching lines @@
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
  * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "talk/app/webrtc/java/jni/native_handle_impl.h"
 
 #include "webrtc/base/checks.h"
-#include "webrtc/base/bind.h"
+#include "webrtc/base/keep_ref_until_done.h"
+#include "webrtc/base/scoped_ref_ptr.h"
 
-using rtc::scoped_refptr;
 using webrtc::NativeHandleBuffer;
 
 namespace webrtc_jni {
 
-namespace {
-void ScaledFrameNotInUse(scoped_refptr<NativeHandleBuffer> original) {}
-}  // anonymous namespace
-
 NativeHandleImpl::NativeHandleImpl(JNIEnv* jni,
                                    jint j_oes_texture_id,
                                    jfloatArray j_transform_matrix)
     : oes_texture_id(j_oes_texture_id) {
   RTC_CHECK_EQ(16, jni->GetArrayLength(j_transform_matrix));
   jfloat* transform_matrix_ptr =
       jni->GetFloatArrayElements(j_transform_matrix, nullptr);
   for (int i = 0; i < 16; ++i) {
     sampling_matrix[i] = transform_matrix_ptr[i];
   }
@@ skipping 28 matching lines @@
   // TODO(perkj) Implement cropping.
   RTC_CHECK_EQ(cropped_input_width, width_);
   RTC_CHECK_EQ(cropped_input_height, height_);
 
   // Here we use Bind magic to add a reference count to |this| until the newly
   // created AndroidTextureBuffer is destructed. ScaledFrameNotInUse will be
   // called that happens and when it finishes, the reference count to |this|
   // will be decreased by one.
   return new rtc::RefCountedObject<AndroidTextureBuffer>(
       dst_widht, dst_height, native_handle_,
-      rtc::Bind(&ScaledFrameNotInUse, this));
+      rtc::KeepRefUntilDone(this));
 }
 
 }  // namespace webrtc_jni