Replace RefCountImpl with rtc::RefCountedObject.

webrtc/modules/video_capture/video_capture_impl.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include "webrtc/modules/video_capture/video_capture_impl.h"
 
 #include <stdlib.h>
 
+#include "webrtc/base/refcount.h"
 #include "webrtc/base/trace_event.h"
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
 #include "webrtc/modules/include/module_common_types.h"
 #include "webrtc/modules/video_capture/video_capture_config.h"
 #include "webrtc/system_wrappers/include/clock.h"
 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
 #include "webrtc/system_wrappers/include/logging.h"
-#include "webrtc/system_wrappers/include/ref_count.h"
 #include "webrtc/system_wrappers/include/tick_util.h"
 
-namespace webrtc
-{
-
-namespace videocapturemodule
-{
-VideoCaptureModule* VideoCaptureImpl::Create(
+namespace webrtc {
+namespace videocapturemodule {
+rtc::scoped_refptr<VideoCaptureModule> VideoCaptureImpl::Create(
     const int32_t id,
-    VideoCaptureExternal*& externalCapture)
-{
-    RefCountImpl<VideoCaptureImpl>* implementation =
-        new RefCountImpl<VideoCaptureImpl>(id);
-    externalCapture = implementation;
-    return implementation;
+    VideoCaptureExternal*& externalCapture) {
+  rtc::scoped_refptr<VideoCaptureImpl> implementation(
+      new rtc::RefCountedObject<VideoCaptureImpl>(id));
+  externalCapture = implementation.get();

[tommi, 2016/01/07 16:41:40]

hmm... should we file a bug for this?

[pbos-webrtc, 2016/01/07 17:23:16]

Maybe, not sure if anyone wants to own it though, so it might just be a
tumbleweed bug. :\

+  return implementation;
 }
 
 const char* VideoCaptureImpl::CurrentDeviceName() const
 {
     return _deviceUniqueId;
 }
 
 // static
 int32_t VideoCaptureImpl::RotationFromDegrees(int degrees,
                                               VideoRotation* rotation) {
@@ skipping 342 matching lines @@
         if (diff > 0)
         {
             return uint32_t((nrOfFrames * 1000.0f / diff) + 0.5f);
         }
     }
 
     return nrOfFrames;
 }
 }  // namespace videocapturemodule
 }  // namespace webrtc