5 files changed, 24 insertions, 30 deletions

diff --git a/base/criticalsection.h b/base/criticalsection.h
index 92745ce..c6ffbc0 100644
--- a/base/criticalsection.h
+++ b/base/criticalsection.h
@@ -29,7 +29,6 @@
 #define TALK_BASE_CRITICALSECTION_H__
 
 #include "talk/base/constructormagic.h"
-#include "webrtc/system_wrappers/interface/thread_annotations.h"
 
 #ifdef WIN32
 #include "talk/base/win32.h"
@@ -52,7 +51,7 @@
 namespace talk_base {
 
 #ifdef WIN32
-class LOCKABLE CriticalSection {
+class CriticalSection {
  public:
   CriticalSection() {
     InitializeCriticalSection(&crit_);
@@ -62,18 +61,18 @@ class LOCKABLE CriticalSection {
   ~CriticalSection() {
     DeleteCriticalSection(&crit_);
   }
-  void Enter() EXCLUSIVE_LOCK_FUNCTION() {
+  void Enter() {
     EnterCriticalSection(&crit_);
     TRACK_OWNER(thread_ = GetCurrentThreadId());
   }
-  bool TryEnter() EXCLUSIVE_TRYLOCK_FUNCTION(true) {
+  bool TryEnter() {
     if (TryEnterCriticalSection(&crit_) != FALSE) {
       TRACK_OWNER(thread_ = GetCurrentThreadId());
       return true;
     }
     return false;
   }
-  void Leave() UNLOCK_FUNCTION() {
+  void Leave() {
     TRACK_OWNER(thread_ = 0);
     LeaveCriticalSection(&crit_);
   }
@@ -89,7 +88,7 @@ class LOCKABLE CriticalSection {
 #endif // WIN32
 
 #ifdef POSIX
-class LOCKABLE CriticalSection {
+class CriticalSection {
  public:
   CriticalSection() {
     pthread_mutexattr_t mutex_attribute;
@@ -102,18 +101,18 @@ class LOCKABLE CriticalSection {
   ~CriticalSection() {
     pthread_mutex_destroy(&mutex_);
   }
-  void Enter() EXCLUSIVE_LOCK_FUNCTION()  {
+  void Enter() {
     pthread_mutex_lock(&mutex_);
     TRACK_OWNER(thread_ = pthread_self());
   }
-  bool TryEnter() EXCLUSIVE_TRYLOCK_FUNCTION(true) {
+  bool TryEnter() {
     if (pthread_mutex_trylock(&mutex_) == 0) {
       TRACK_OWNER(thread_ = pthread_self());
       return true;
     }
     return false;
   }
-  void Leave() UNLOCK_FUNCTION() {
+  void Leave() {
     TRACK_OWNER(thread_ = 0);
     pthread_mutex_unlock(&mutex_);
   }
@@ -129,13 +128,13 @@ class LOCKABLE CriticalSection {
 #endif // POSIX
 
 // CritScope, for serializing execution through a scope.
-class SCOPED_LOCKABLE CritScope {
+class CritScope {
  public:
-  explicit CritScope(CriticalSection *pcrit) EXCLUSIVE_LOCK_FUNCTION(pcrit) {
+  explicit CritScope(CriticalSection *pcrit) {
     pcrit_ = pcrit;
     pcrit_->Enter();
   }
-  ~CritScope() UNLOCK_FUNCTION() {
+  ~CritScope() {
     pcrit_->Leave();
   }
  private:
diff --git a/base/sharedexclusivelock.h b/base/sharedexclusivelock.h
index d06aa01..2bdd854 100644
--- a/base/sharedexclusivelock.h
+++ b/base/sharedexclusivelock.h
@@ -36,14 +36,14 @@ namespace talk_base {
 
 // This class provides shared-exclusive lock. It can be used in cases like
 // multiple-readers/single-writer model.
-class LOCKABLE SharedExclusiveLock {
+class SharedExclusiveLock {
  public:
   SharedExclusiveLock();
 
   // Locking/unlocking methods. It is encouraged to use SharedScope or
   // ExclusiveScope for protection.
-  void LockExclusive() EXCLUSIVE_LOCK_FUNCTION();
-  void UnlockExclusive() UNLOCK_FUNCTION();
+  void LockExclusive();
+  void UnlockExclusive();
   void LockShared();
   void UnlockShared();
 
@@ -56,14 +56,13 @@ class LOCKABLE SharedExclusiveLock {
   DISALLOW_COPY_AND_ASSIGN(SharedExclusiveLock);
 };
 
-class SCOPED_LOCKABLE SharedScope {
+class SharedScope {
  public:
-  explicit SharedScope(SharedExclusiveLock* lock) SHARED_LOCK_FUNCTION(lock)
-      : lock_(lock) {
+  explicit SharedScope(SharedExclusiveLock* lock) : lock_(lock) {
     lock_->LockShared();
   }
 
-  ~SharedScope() UNLOCK_FUNCTION() {
+  ~SharedScope() {
     lock_->UnlockShared();
   }
 
@@ -73,15 +72,13 @@ class SCOPED_LOCKABLE SharedScope {
   DISALLOW_COPY_AND_ASSIGN(SharedScope);
 };
 
-class SCOPED_LOCKABLE ExclusiveScope {
+class ExclusiveScope {
  public:
-  explicit ExclusiveScope(SharedExclusiveLock* lock)
-      EXCLUSIVE_LOCK_FUNCTION(lock)
-      : lock_(lock) {
+  explicit ExclusiveScope(SharedExclusiveLock* lock) : lock_(lock) {
     lock_->LockExclusive();
   }
 
-  ~ExclusiveScope() UNLOCK_FUNCTION() {
+  ~ExclusiveScope() {
     lock_->UnlockExclusive();
   }
 
diff --git a/base/signalthread.h b/base/signalthread.h
index 5865bf9..46dd0a3 100644
--- a/base/signalthread.h
+++ b/base/signalthread.h
@@ -132,17 +132,16 @@ class SignalThread
     DISALLOW_IMPLICIT_CONSTRUCTORS(Worker);
   };
 
-  class SCOPED_LOCKABLE EnterExit {
+  class EnterExit {
    public:
-    explicit EnterExit(SignalThread* t) EXCLUSIVE_LOCK_FUNCTION(t->cs_)
-        : t_(t) {
+    explicit EnterExit(SignalThread* t) : t_(t) {
       t_->cs_.Enter();
       // If refcount_ is zero then the object has already been deleted and we
       // will be double-deleting it in ~EnterExit()! (shouldn't happen)
       ASSERT(t_->refcount_ != 0);
       ++t_->refcount_;
     }
-    ~EnterExit() UNLOCK_FUNCTION() {
+    ~EnterExit() {
       bool d = (0 == --t_->refcount_);
       t_->cs_.Leave();
       if (d)
diff --git a/build/common.gypi b/build/common.gypi
index 7bd1992..4c762d1 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -89,7 +89,6 @@
               # LateBindingSymbolTable::TableInfo from
               # latebindingsymboltable.cc.def and remove below flag.
               '-Wno-address-of-array-temporary',
-              '-Wthread-safety',
             ],
           }],
         ],
diff --git a/session/media/mediamonitor.h b/session/media/mediamonitor.h
index 7a416be..a9ce889 100644
--- a/session/media/mediamonitor.h
+++ b/session/media/mediamonitor.h
@@ -77,7 +77,7 @@ class MediaMonitorT : public MediaMonitor {
     media_info_.Clear();
     media_channel_->GetStats(&media_info_);
   }
-  virtual void Update() EXCLUSIVE_LOCKS_REQUIRED(crit_) {
+  virtual void Update() {
     MI stats(media_info_);
     crit_.Leave();
     SignalUpdate(media_channel_, stats);