Remove definitions of thread annotation macros without RTC_ prefix

webrtc/rtc_base/thread_checker.h

 /*
  *  Copyright (c) 2014 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.
  */
 
 // Borrowed from Chromium's src/base/threading/thread_checker.h.
 
 #ifndef WEBRTC_RTC_BASE_THREAD_CHECKER_H_
 #define WEBRTC_RTC_BASE_THREAD_CHECKER_H_
 
 // Apart from debug builds, we also enable the thread checker in
 // builds with RTC_DCHECK_IS_ON so that trybots and waterfall bots
 // with this define will get the same level of thread checking as
 // debug bots.
-#define ENABLE_THREAD_CHECKER RTC_DCHECK_IS_ON
+#define RTC_ENABLE_THREAD_CHECKER RTC_DCHECK_IS_ON
 
 #include "webrtc/rtc_base/checks.h"
 #include "webrtc/rtc_base/constructormagic.h"
 #include "webrtc/rtc_base/thread_annotations.h"
 #include "webrtc/rtc_base/thread_checker_impl.h"
 
 namespace rtc {
 
 // Do nothing implementation, for use in release mode.
 //
@@ skipping 32 matching lines @@
 //   void Foo() {
 //     RTC_DCHECK(thread_checker_.CalledOnValidThread());
 //     ... (do stuff) ...
 //   }
 //
 //  private:
 //   ThreadChecker thread_checker_;
 // }
 //
 // In Release mode, CalledOnValidThread will always return true.
-#if ENABLE_THREAD_CHECKER
+#if RTC_ENABLE_THREAD_CHECKER
 class RTC_LOCKABLE ThreadChecker : public ThreadCheckerImpl {};
 #else
 class RTC_LOCKABLE ThreadChecker : public ThreadCheckerDoNothing {};
-#endif  // ENABLE_THREAD_CHECKER
+#endif  // RTC_ENABLE_THREAD_CHECKER
 
-#undef ENABLE_THREAD_CHECKER
+#undef RTC_ENABLE_THREAD_CHECKER
 
 namespace internal {
 class RTC_SCOPED_LOCKABLE AnnounceOnThread {
  public:
   template <typename ThreadLikeObject>
   explicit AnnounceOnThread(const ThreadLikeObject* thread_like_object)
       RTC_EXCLUSIVE_LOCK_FUNCTION(thread_like_object) {}
   ~AnnounceOnThread() RTC_UNLOCK_FUNCTION() {}
 
   template<typename ThreadLikeObject>
@@ skipping 67 matching lines @@
 //     rtc::scoped_ref_ptr<Encoder> encoder = encoder_;
 //     encoder_->Queue()->PostTask([encoder] { encoder->Encode(); });
 //   }
 //
 //  private:
 //   rtc::scoped_ref_ptr<Encoder> encoder_;
 // }
 
 // Document if a variable/field is not shared and should be accessed from
 // same thread/task queue.
-#define ACCESS_ON(x) RTC_THREAD_ANNOTATION_ATTRIBUTE__(guarded_by(x))
 #define RTC_ACCESS_ON(x) RTC_THREAD_ANNOTATION_ATTRIBUTE__(guarded_by(x))
 
 // Document if a function expected to be called from same thread/task queue.
-#define RUN_ON(x) RTC_THREAD_ANNOTATION_ATTRIBUTE__(exclusive_locks_required(x))
 #define RTC_RUN_ON(x) RTC_THREAD_ANNOTATION_ATTRIBUTE__(exclusive_locks_required(x))
 
 #define RTC_DCHECK_RUN_ON(thread_like_object) \
   rtc::internal::AnnounceOnThread thread_announcer(thread_like_object); \
   RTC_DCHECK(rtc::internal::AnnounceOnThread::IsCurrent(thread_like_object))
 
 #endif  // WEBRTC_RTC_BASE_THREAD_CHECKER_H_