Replace RefCountImpl with rtc::RefCountedObject.

webrtc/modules/audio_device/audio_device_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/base/refcount.h"
 #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
 #include "webrtc/modules/audio_device/audio_device_config.h"
 #include "webrtc/modules/audio_device/audio_device_impl.h"
-#include "webrtc/system_wrappers/include/ref_count.h"
 #include "webrtc/system_wrappers/include/tick_util.h"
 
 #include <assert.h>
 #include <string.h>
 
 #if defined(_WIN32)
     #include "audio_device_wave_win.h"
  #if defined(WEBRTC_WINDOWS_CORE_AUDIO_BUILD)
     #include "audio_device_core_win.h"
  #endif
@@ skipping 33 matching lines @@
     };                              \
 }
 
 #define CHECK_INITIALIZED_BOOL()    \
 {                                   \
     if (!_initialized) {            \
         return false;               \
     };                              \
 }
 
-namespace webrtc
-{
-
-AudioDeviceModule* CreateAudioDeviceModule(
-    int32_t id, AudioDeviceModule::AudioLayer audioLayer) {
-  return AudioDeviceModuleImpl::Create(id, audioLayer);
-}
+namespace webrtc {
 
 // ============================================================================
 //                                   Static methods
 // ============================================================================
 
 // ----------------------------------------------------------------------------
 //  AudioDeviceModule::Create()
 // ----------------------------------------------------------------------------
 
-AudioDeviceModule* AudioDeviceModuleImpl::Create(const int32_t id,
-                                                 const AudioLayer audioLayer)
-{
+rtc::scoped_refptr<AudioDeviceModule> AudioDeviceModuleImpl::Create(
+    const int32_t id,
+    const AudioLayer audioLayer) {
     // Create the generic ref counted (platform independent) implementation.
-    RefCountImpl<AudioDeviceModuleImpl>* audioDevice =
-        new RefCountImpl<AudioDeviceModuleImpl>(id, audioLayer);
+    rtc::scoped_refptr<AudioDeviceModuleImpl> audioDevice(
+        new rtc::RefCountedObject<AudioDeviceModuleImpl>(id, audioLayer));
 
     // Ensure that the current platform is supported.
     if (audioDevice->CheckPlatform() == -1)
     {
-        delete audioDevice;
-        return NULL;
+        return nullptr;
     }
 
     // Create the platform-dependent implementation.
     if (audioDevice->CreatePlatformSpecificObjects() == -1)
     {
-        delete audioDevice;
-        return NULL;
+        return nullptr;
     }
 
     // Ensure that the generic audio buffer can communicate with the
     // platform-specific parts.
     if (audioDevice->AttachAudioBuffer() == -1)
     {
-        delete audioDevice;
-        return NULL;
+        return nullptr;
     }
 
     WebRtcSpl_Init();
 
     return audioDevice;
 }
 
 // ============================================================================
 //                            Construction & Destruction
 // ============================================================================
@@ skipping 1815 matching lines @@
 // ----------------------------------------------------------------------------
 //  PlatformAudioLayer
 // ----------------------------------------------------------------------------
 
 AudioDeviceModule::AudioLayer AudioDeviceModuleImpl::PlatformAudioLayer() const
 {
     return _platformAudioLayer;
 }
 
 }  // namespace webrtc