Unify usage of logging/assert macros in base/

base/threading/thread_checker.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef BASE_THREADING_THREAD_CHECKER_H_
 #define BASE_THREADING_THREAD_CHECKER_H_
 
 #include "base/logging.h"
 #include "base/threading/thread_checker_impl.h"
 
-// Apart from debug builds, we also enable the thread checker in
-// builds with DCHECK_ALWAYS_ON so that trybots and waterfall bots
-// with this define will get the same level of thread checking as
-// debug bots.
-#if DCHECK_IS_ON()
-#define ENABLE_THREAD_CHECKER 1
-#else
-#define ENABLE_THREAD_CHECKER 0
-#endif
-
 namespace base {
 
 // Do nothing implementation, for use in release mode.
 //
 // Note: You should almost always use the ThreadChecker class to get the
 // right version for your build configuration.
 class ThreadCheckerDoNothing {
  public:
   bool CalledOnValidThread() const WARN_UNUSED_RESULT {
     return true;
@@ skipping 26 matching lines @@
 //   void Foo() {
 //     DCHECK(thread_checker_.CalledOnValidThread());
 //     ... (do stuff) ...
 //   }
 //
 //  private:
 //   ThreadChecker thread_checker_;
 // }
 //
 // In Release mode, CalledOnValidThread will always return true.
-#if ENABLE_THREAD_CHECKER
+#if DCHECK_IS_ON()
 class ThreadChecker : public ThreadCheckerImpl {
 };
 #else
 class ThreadChecker : public ThreadCheckerDoNothing {
 };
-#endif  // ENABLE_THREAD_CHECKER
-
-#undef ENABLE_THREAD_CHECKER
+#endif  // DCHECK_IS_ON()
 
 }  // namespace base
 
 #endif  // BASE_THREADING_THREAD_CHECKER_H_