Clean up SkDynamicAnnotations.

include/core/SkLazyPtr.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkLazyPtr_DEFINED
 #define SkLazyPtr_DEFINED
 
@@ skipping 85 matching lines @@
 // _through_ our atomically set pointer, there is a data dependency between our
 // atomic and the guarded data, and so we only need writer-releases /
 // reader-consumes memory pairing rather than the more general write-releases /
 // reader-acquires convention.
 //
 // This is nice, because a consume load is free on all our platforms: x86,
 // ARM, MIPS.  In contrast, an acquire load issues a memory barrier on non-x86.
 
 template <typename T>
 T consume_load(T* ptr) {
-#if DYNAMIC_ANNOTATIONS_ENABLED
+#if defined(THREAD_SANITIZER)
     // TSAN gets anxious if we don't tell it what we're actually doing, a consume load.
     return sk_atomic_load(ptr, sk_memory_order_consume);
 #else
     // All current compilers blindly upgrade consume memory order to acquire memory order.
     // For our purposes, though, no memory barrier is required, so we lie and use relaxed.
     return sk_atomic_load(ptr, sk_memory_order_relaxed);
 #endif
 }
 
 // This has no constructor and must be zero-initalized (the macro above does this).
@@ skipping 53 matching lines @@
         T* ptr = Private::consume_load(&fPtr);
         return ptr ? ptr : Private::try_cas<T*, Destroy>(&fPtr, create());
     }
 
 private:
     mutable T* fPtr;
 };
 
 
 #endif//SkLazyPtr_DEFINED