s/NDEBUG/NVALGRIND/g in base/dynamic_annotations.* to allow...

base/dynamic_annotations.cc

 // Copyright (c) 2006-2008 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.
 
 #include "base/dynamic_annotations.h"
-#include "base/third_party/valgrind/valgrind.h"
 
-#ifndef NDEBUG
+#ifndef NVALGRIND
 // Each function is empty and called (via a macro) only in debug mode.
 // The arguments are captured by dynamic tools at runtime.
 
 extern "C" void AnnotateRWLockCreate(const char *file, int line,
                                      const volatile void *lock) {}
 extern "C" void AnnotateRWLockDestroy(const char *file, int line,
                                       const volatile void *lock) {}
 extern "C" void AnnotateRWLockAcquired(const char *file, int line,
                                        const volatile void *lock, long is_w) {}
 extern "C" void AnnotateRWLockReleased(const char *file, int line,
@@ skipping 30 matching lines @@
 extern "C" void AnnotateTraceMemory(const char *file, int line,
                                     const volatile void *arg) {}
 extern "C" void AnnotateThreadName(const char *file, int line,
                                    const char *name) {}
 extern "C" void AnnotateIgnoreReadsBegin(const char *file, int line) {}
 extern "C" void AnnotateIgnoreReadsEnd(const char *file, int line) {}
 extern "C" void AnnotateIgnoreWritesBegin(const char *file, int line) {}
 extern "C" void AnnotateIgnoreWritesEnd(const char *file, int line) {}
 extern "C" void AnnotateNoOp(const char *file, int line,
                              const volatile void *arg) {}
-#endif // NDEBUG
+#endif // NVALGRIND
 
 // When running under valgrind, a non-zero value will be returned.
 extern "C" int RunningOnValgrind() {
 #if defined(NVALGRIND)
   return 0;
 #else
   return RUNNING_ON_VALGRIND;
 #endif
 }