Replace Atomic32 with webrtc/base/atomicops.h.

webrtc/voice_engine/channel_manager.h

 /*
  *  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.
  */
 
 #ifndef WEBRTC_VOICE_ENGINE_CHANNEL_MANAGER_H
 #define WEBRTC_VOICE_ENGINE_CHANNEL_MANAGER_H
 
 #include <vector>
 
+#include "webrtc/base/atomicops.h"
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/call/rtc_event_log.h"
-#include "webrtc/system_wrappers/interface/atomic32.h"
 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
 
 class Config;
 
 namespace voe {
 
 class Channel;
@@ skipping 18 matching lines @@
  public:
   explicit ChannelOwner(Channel* channel);
   ChannelOwner(const ChannelOwner& channel_owner);
 
   ~ChannelOwner();
 
   ChannelOwner& operator=(const ChannelOwner& other);
 
   Channel* channel() const { return channel_ref_->channel.get(); }
   bool IsValid() { return channel_ref_->channel.get() != NULL; }
-  int use_count() const { return channel_ref_->ref_count.Value(); }
+  int use_count() const {
+    return rtc::AtomicOps::AcquireLoad(&channel_ref_->ref_count);
+  }
+
  private:
   // Shared instance of a Channel. Copying ChannelOwners increase the reference
   // count and destroying ChannelOwners decrease references. Channels are
   // deleted when no references to them are held.
   struct ChannelRef {
     ChannelRef(Channel* channel);
     const rtc::scoped_ptr<Channel> channel;
-    Atomic32 ref_count;
+    volatile int ref_count;
   };
 
   ChannelRef* channel_ref_;
 };
 
 class ChannelManager {
  public:
   ChannelManager(uint32_t instance_id, const Config& config);
 
   // Upon construction of an Iterator it will grab a copy of the channel list of
@@ skipping 37 matching lines @@
 
   // Returns a pointer to the event log object stored within the ChannelManager.
   RtcEventLog* GetEventLog() const;
 
  private:
   // Create a channel given a configuration, |config|.
   ChannelOwner CreateChannelInternal(const Config& config);
 
   uint32_t instance_id_;
 
-  Atomic32 last_channel_id_;
+  volatile int last_channel_id_;
 
   rtc::scoped_ptr<CriticalSectionWrapper> lock_;
   std::vector<ChannelOwner> channels_;
 
   const Config& config_;
   rtc::scoped_ptr<RtcEventLog> event_log_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(ChannelManager);
 };
 }  // namespace voe
 }  // namespace webrtc
 
 #endif  // WEBRTC_VOICE_ENGINE_CHANNEL_MANAGER_H