| Index: webrtc/modules/audio_device/audio_device_impl.cc
 | 
| diff --git a/webrtc/modules/audio_device/audio_device_impl.cc b/webrtc/modules/audio_device/audio_device_impl.cc
 | 
| index ad643e9684688a5ae9cf641364bdd3425f31a817..bd55db2f779dc5ceb359649a7d01cd5266911a2f 100644
 | 
| --- a/webrtc/modules/audio_device/audio_device_impl.cc
 | 
| +++ b/webrtc/modules/audio_device/audio_device_impl.cc
 | 
| @@ -122,8 +122,8 @@ AudioDeviceModuleImpl::AudioDeviceModuleImpl(const int32_t id,
 | 
|      : _critSect(*CriticalSectionWrapper::CreateCriticalSection()),
 | 
|        _critSectEventCb(*CriticalSectionWrapper::CreateCriticalSection()),
 | 
|        _critSectAudioCb(*CriticalSectionWrapper::CreateCriticalSection()),
 | 
| -      _ptrCbAudioDeviceObserver(NULL),
 | 
| -      _ptrAudioDevice(NULL),
 | 
| +      _ptrCbAudioDeviceObserver(nullptr),
 | 
| +      _ptrAudioDevice(nullptr),
 | 
|        _id(id),
 | 
|        _platformAudioLayer(audioLayer),
 | 
|        _lastProcessTime(rtc::TimeMillis()),
 | 
| @@ -181,7 +181,7 @@ int32_t AudioDeviceModuleImpl::CheckPlatform() {
 | 
|  int32_t AudioDeviceModuleImpl::CreatePlatformSpecificObjects() {
 | 
|    LOG(INFO) << __FUNCTION__;
 | 
|  
 | 
| -  AudioDeviceGeneric* ptrAudioDevice(NULL);
 | 
| +  AudioDeviceGeneric* ptrAudioDevice(nullptr);
 | 
|  
 | 
|  #if defined(WEBRTC_DUMMY_AUDIO_BUILD)
 | 
|    ptrAudioDevice = new AudioDeviceDummy(Id());
 | 
| @@ -223,7 +223,7 @@ int32_t AudioDeviceModuleImpl::CreatePlatformSpecificObjects() {
 | 
|      } else {
 | 
|        // create *Windows Wave Audio* implementation
 | 
|        ptrAudioDevice = new AudioDeviceWindowsWave(Id());
 | 
| -      if (ptrAudioDevice != NULL) {
 | 
| +      if (ptrAudioDevice != nullptr) {
 | 
|          // Core Audio was not supported => revert to Windows Wave instead
 | 
|          _platformAudioLayer =
 | 
|              kWindowsWaveAudio;  // modify the state set at construction
 | 
| @@ -295,7 +295,7 @@ int32_t AudioDeviceModuleImpl::CreatePlatformSpecificObjects() {
 | 
|  #if defined(LINUX_ALSA)
 | 
|        // create *Linux ALSA Audio* implementation
 | 
|        ptrAudioDevice = new AudioDeviceLinuxALSA(Id());
 | 
| -      if (ptrAudioDevice != NULL) {
 | 
| +      if (ptrAudioDevice != nullptr) {
 | 
|          // Pulse Audio was not supported => revert to ALSA instead
 | 
|          _platformAudioLayer =
 | 
|              kLinuxAlsaAudio;  // modify the state set at construction
 | 
| @@ -346,7 +346,7 @@ int32_t AudioDeviceModuleImpl::CreatePlatformSpecificObjects() {
 | 
|    }
 | 
|  #endif  // if defined(WEBRTC_DUMMY_AUDIO_BUILD)
 | 
|  
 | 
| -  if (ptrAudioDevice == NULL) {
 | 
| +  if (ptrAudioDevice == nullptr) {
 | 
|      LOG(LERROR)
 | 
|          << "unable to create the platform specific audio device implementation";
 | 
|      return -1;
 | 
| @@ -384,7 +384,7 @@ AudioDeviceModuleImpl::~AudioDeviceModuleImpl() {
 | 
|  
 | 
|    if (_ptrAudioDevice) {
 | 
|      delete _ptrAudioDevice;
 | 
| -    _ptrAudioDevice = NULL;
 | 
| +    _ptrAudioDevice = nullptr;
 | 
|    }
 | 
|  
 | 
|    delete &_critSect;
 | 
| @@ -1252,7 +1252,7 @@ int32_t AudioDeviceModuleImpl::PlayoutDeviceName(
 | 
|    LOG(INFO) << __FUNCTION__ << "(" << index << ", ...)";
 | 
|    CHECK_INITIALIZED();
 | 
|  
 | 
| -  if (name == NULL) {
 | 
| +  if (name == nullptr) {
 | 
|      _lastError = kAdmErrArgument;
 | 
|      return -1;
 | 
|    }
 | 
| @@ -1261,10 +1261,10 @@ int32_t AudioDeviceModuleImpl::PlayoutDeviceName(
 | 
|      return -1;
 | 
|    }
 | 
|  
 | 
| -  if (name != NULL) {
 | 
| +  if (name != nullptr) {
 | 
|      LOG(INFO) << "output: name = " << name;
 | 
|    }
 | 
| -  if (guid != NULL) {
 | 
| +  if (guid != nullptr) {
 | 
|      LOG(INFO) << "output: guid = " << guid;
 | 
|    }
 | 
|  
 | 
| @@ -1282,7 +1282,7 @@ int32_t AudioDeviceModuleImpl::RecordingDeviceName(
 | 
|    LOG(INFO) << __FUNCTION__ << "(" << index << ", ...)";
 | 
|    CHECK_INITIALIZED();
 | 
|  
 | 
| -  if (name == NULL) {
 | 
| +  if (name == nullptr) {
 | 
|      _lastError = kAdmErrArgument;
 | 
|      return -1;
 | 
|    }
 | 
| @@ -1291,10 +1291,10 @@ int32_t AudioDeviceModuleImpl::RecordingDeviceName(
 | 
|      return -1;
 | 
|    }
 | 
|  
 | 
| -  if (name != NULL) {
 | 
| +  if (name != nullptr) {
 | 
|      LOG(INFO) << "output: name = " << name;
 | 
|    }
 | 
| -  if (guid != NULL) {
 | 
| +  if (guid != nullptr) {
 | 
|      LOG(INFO) << "output: guid = " << guid;
 | 
|    }
 | 
|  
 | 
| @@ -1508,7 +1508,7 @@ int32_t AudioDeviceModuleImpl::StartRawInputFileRecording(
 | 
|    LOG(INFO) << __FUNCTION__;
 | 
|    CHECK_INITIALIZED();
 | 
|  
 | 
| -  if (NULL == pcmFileNameUTF8) {
 | 
| +  if (nullptr == pcmFileNameUTF8) {
 | 
|      return -1;
 | 
|    }
 | 
|  
 | 
| @@ -1535,7 +1535,7 @@ int32_t AudioDeviceModuleImpl::StartRawOutputFileRecording(
 | 
|    LOG(INFO) << __FUNCTION__;
 | 
|    CHECK_INITIALIZED();
 | 
|  
 | 
| -  if (NULL == pcmFileNameUTF8) {
 | 
| +  if (nullptr == pcmFileNameUTF8) {
 | 
|      return -1;
 | 
|    }
 | 
|  
 | 
| 
 |