Replace Atomic32 with webrtc/base/atomicops.h.

webrtc/voice_engine/channel_manager.cc

 /*
  *  Copyright (c) 2011 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/voice_engine/channel_manager.h"
 
+#include "webrtc/base/atomicops.h"
 #include "webrtc/common.h"
 #include "webrtc/voice_engine/channel.h"
 
 namespace webrtc {
 namespace voe {
 
 ChannelOwner::ChannelOwner(class Channel* channel)
     : channel_ref_(new ChannelRef(channel)) {}
 
 ChannelOwner::ChannelOwner(const ChannelOwner& channel_owner)
     : channel_ref_(channel_owner.channel_ref_) {
-  ++channel_ref_->ref_count;
+  rtc::AtomicOps::Increment(&channel_ref_->ref_count);
 }
 
 ChannelOwner::~ChannelOwner() {
-  if (--channel_ref_->ref_count == 0)
+  if (rtc::AtomicOps::Decrement(&channel_ref_->ref_count) == 0)
     delete channel_ref_;
 }
 
 ChannelOwner& ChannelOwner::operator=(const ChannelOwner& other) {
   if (other.channel_ref_ == channel_ref_)
     return *this;
 
-  if (--channel_ref_->ref_count == 0)
+  if (rtc::AtomicOps::Decrement(&channel_ref_->ref_count) == 0)
     delete channel_ref_;
 
   channel_ref_ = other.channel_ref_;
-  ++channel_ref_->ref_count;
+  rtc::AtomicOps::Increment(&channel_ref_->ref_count);
 
   return *this;
 }
 
 ChannelOwner::ChannelRef::ChannelRef(class Channel* channel)
     : channel(channel), ref_count(1) {}
 
 ChannelManager::ChannelManager(uint32_t instance_id, const Config& config)
     : instance_id_(instance_id),
       last_channel_id_(-1),
       lock_(CriticalSectionWrapper::CreateCriticalSection()),
       config_(config),
       event_log_(RtcEventLog::Create()) {}
 
 ChannelOwner ChannelManager::CreateChannel() {
   return CreateChannelInternal(config_);
 }
 
 ChannelOwner ChannelManager::CreateChannel(const Config& external_config) {
   return CreateChannelInternal(external_config);
 }
 
 ChannelOwner ChannelManager::CreateChannelInternal(const Config& config) {
   Channel* channel;
-  Channel::CreateChannel(channel, ++last_channel_id_, instance_id_,
-                         event_log_.get(), config);
+  Channel::CreateChannel(channel, rtc::AtomicOps::Increment(&last_channel_id_),
+                         instance_id_, event_log_.get(), config);
   ChannelOwner channel_owner(channel);
 
   CriticalSectionScoped crit(lock_.get());
 
   channels_.push_back(channel_owner);
 
   return channel_owner;
 }
 
 ChannelOwner ChannelManager::GetChannel(int32_t channel_id) {
@@ skipping 71 matching lines @@
 bool ChannelManager::Iterator::IsValid() {
   return iterator_pos_ < channels_.size();
 }
 
 void ChannelManager::Iterator::Increment() {
   ++iterator_pos_;
 }
 
 }  // namespace voe
 }  // namespace webrtc