Replace RefCountImpl with rtc::RefCountedObject.

webrtc/modules/video_capture/linux/video_capture_linux.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 <errno.h>
 #include <fcntl.h>
 #include <linux/videodev2.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
 #include <iostream>
 #include <new>
 
+#include "webrtc/base/refcount.h"
+#include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/modules/video_capture/linux/video_capture_linux.h"
 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
-#include "webrtc/system_wrappers/include/ref_count.h"
 #include "webrtc/system_wrappers/include/trace.h"
 
-namespace webrtc
-{
-namespace videocapturemodule
-{
-VideoCaptureModule* VideoCaptureImpl::Create(const int32_t id,
-                                             const char* deviceUniqueId)
-{
-    RefCountImpl<videocapturemodule::VideoCaptureModuleV4L2>* implementation =
-        new RefCountImpl<videocapturemodule::VideoCaptureModuleV4L2>(id);
+namespace webrtc {
+namespace videocapturemodule {
+rtc::scoped_refptr<VideoCaptureModule> VideoCaptureImpl::Create(
+    const int32_t id,
+    const char* deviceUniqueId) {
+    rtc::scoped_refptr<VideoCaptureModuleV4L2> implementation(
+        new rtc::RefCountedObject<VideoCaptureModuleV4L2>(id));
 
-    if (!implementation || implementation->Init(deviceUniqueId) != 0)
-    {
-        delete implementation;
-        implementation = NULL;
-    }
+    if (implementation->Init(deviceUniqueId) != 0)
+        return nullptr;
 
     return implementation;
 }
 
 VideoCaptureModuleV4L2::VideoCaptureModuleV4L2(const int32_t id)
     : VideoCaptureImpl(id),
       _captureCritSect(CriticalSectionWrapper::CreateCriticalSection()),
       _deviceId(-1),
       _deviceFd(-1),
       _buffersAllocatedByDevice(-1),
@@ skipping 429 matching lines @@
 {
     settings.width = _currentWidth;
     settings.height = _currentHeight;
     settings.maxFPS = _currentFrameRate;
     settings.rawType=_captureVideoType;
 
     return 0;
 }
 }  // namespace videocapturemodule
 }  // namespace webrtc