Replace RefCountImpl with rtc::RefCountedObject.

webrtc/modules/video_capture/mac/video_capture_mac.mm

 /*
  *  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.
  */
 
 /*
  *  video_capture_mac.cc
  *
  */
 
 #include <QuickTime/QuickTime.h>
 
+#include "webrtc/base/refcount.h"
+#include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/modules/video_capture/device_info_impl.h"
 #include "webrtc/modules/video_capture/video_capture_config.h"
 #include "webrtc/modules/video_capture/video_capture_impl.h"
-#include "webrtc/system_wrappers/include/ref_count.h"
 #include "webrtc/system_wrappers/include/trace.h"
 
 // 10.4 support must be decided runtime. We will just decide which framework to
 // use at compile time "work" classes. One for QTKit, one for QuickTime
 #if __MAC_OS_X_VERSION_MIN_REQUIRED == __MAC_10_4 // QuickTime version
 #include <QuickTime/video_capture_quick_time.h>
 #include <QuickTime/video_capture_quick_time_info.h>
 #else
 #include "webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit.h"
 #include "webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_info.h"
@@ skipping 70 matching lines @@
 /*
  *   Returns version of the module and its components
  *
  *   version                 - buffer to which the version will be written
  *   remainingBufferInBytes  - remaining number of int8_t in the version
  *                             buffer
  *   position                - position of the next empty int8_t in the
  *                             version buffer
  */
 
-VideoCaptureModule* VideoCaptureImpl::Create(
-    const int32_t id, const char* deviceUniqueIdUTF8)
-{
-
-    if (webrtc::videocapturemodule::CheckOSVersion() == false)
-    {
+rtc::scoped_refptr<VideoCaptureModule> VideoCaptureImpl::Create(
+    const int32_t id,
+    const char* deviceUniqueIdUTF8) {
+    if (!CheckOSVersion()) {
         WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceVideoCapture, id,
                      "OS version is too old. Could not create video capture "
                      "module. Returning NULL");
-        return NULL;
+        return nullptr;
     }
 
 #if __MAC_OS_X_VERSION_MIN_REQUIRED == __MAC_10_4 // QuickTime version
-    if (webrtc::videocapturemodule::CheckQTVersion() == false)
+    if (!CheckQTVersion())
     {
         WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceVideoCapture, id,
                      "QuickTime version is too old. Could not create video "
                      "capture module. Returning NULL");
-        return NULL;
+        return nullptr;
     }
 
     WEBRTC_TRACE(webrtc::kTraceInfo, webrtc::kTraceVideoCapture, id,
                  "%s line %d. QTKit is not supported on this machine. Using "
                  "QuickTime framework to capture video",
                  __FILE__, __LINE__);
 
-    RefCountImpl<videocapturemodule::VideoCaptureMacQuickTime>*
-        newCaptureModule =
-            new RefCountImpl<videocapturemodule::VideoCaptureMacQuickTime>(id);
-
-    if (!newCaptureModule)
-    {
-        WEBRTC_TRACE(webrtc::kTraceDebug, webrtc::kTraceVideoCapture, id,
-                     "could not Create for unique device %s, !newCaptureModule",
-                     deviceUniqueIdUTF8);
-        return NULL;
-    }
+    rtc::scoped_refptr<VideoCaptureMacQuickTime> newCaptureModule(
+        new rtc::RefCountedObject<VideoCaptureMacQuickTime>(id));
 
     if (newCaptureModule->Init(id, deviceUniqueIdUTF8) != 0)
     {
         WEBRTC_TRACE(webrtc::kTraceDebug, webrtc::kTraceVideoCapture, id,
                      "could not Create for unique device %s, "
                      "newCaptureModule->Init()!=0",
                      deviceUniqueIdUTF8);
-        delete newCaptureModule;
-        return NULL;
+        return nullptr;
     }
 
     // Successfully created VideoCaptureMacQuicktime. Return it
     WEBRTC_TRACE(webrtc::kTraceInfo, webrtc::kTraceVideoCapture, id,
                  "Module created for unique device %s. Will use QuickTime "
                  "framework to capture",
                  deviceUniqueIdUTF8);
     return newCaptureModule;
 
 #else // QTKit version
 
     WEBRTC_TRACE(webrtc::kTraceInfo, webrtc::kTraceVideoCapture, id,
                  "Using QTKit framework to capture video", id);
 
-    RefCountImpl<videocapturemodule::VideoCaptureMacQTKit>* newCaptureModule =
-        new RefCountImpl<videocapturemodule::VideoCaptureMacQTKit>(id);
+    rtc::scoped_refptr<VideoCaptureMacQTKit> newCaptureModule(
+        new rtc::RefCountedObject<VideoCaptureMacQTKit>(id));
 
-    if(!newCaptureModule)
-    {
-        WEBRTC_TRACE(webrtc::kTraceDebug, webrtc::kTraceVideoCapture, id,
-                     "could not Create for unique device %s, !newCaptureModule",
-                     deviceUniqueIdUTF8);
-        return NULL;
-    }
     if(newCaptureModule->Init(id, deviceUniqueIdUTF8) != 0)
     {
         WEBRTC_TRACE(webrtc::kTraceDebug, webrtc::kTraceVideoCapture, id,
                      "could not Create for unique device %s, "
                      "newCaptureModule->Init()!=0", deviceUniqueIdUTF8);
-        delete newCaptureModule;
-        return NULL;
+        return nullptr;
     }
 
     // Successfully created VideoCaptureMacQuicktime. Return it
     WEBRTC_TRACE(webrtc::kTraceInfo, webrtc::kTraceVideoCapture, id,
                  "Module created for unique device %s, will use QTKit "
                  "framework",deviceUniqueIdUTF8);
     return newCaptureModule;
 #endif
 }
 
@@ skipping 63 matching lines @@
 
 }
 
 /**************************************************************************
  *
  *    End Create/Destroy VideoCaptureModule
  *
  ***************************************************************************/
 }  // namespace videocapturemodule
 }  // namespace webrtc