Update dynamic annotations and move them to base/third_party

build/common.gypi

 # Copyright (c) 2010 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.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   'variables': {
     # .gyp files or targets should set chromium_code to 1 if they build
@@ skipping 604 matching lines @@
               ['<(DEPTH)/third_party/platformsdk_win7/files/Lib/x64'],
           },
         },
         'defines': [
           # Not sure if tcmalloc works on 64-bit Windows.
           'NO_TCMALLOC',
         ],
       },
       'Debug_Base': {
         'abstract': 1,
+        'defines': ['DYNAMIC_ANNOTATIONS_ENABLED=1'],
         'xcode_settings': {
           'COPY_PHASE_STRIP': 'NO',
           'GCC_OPTIMIZATION_LEVEL': '<(mac_debug_optimization)',
           'OTHER_CFLAGS': [ '<@(debug_extra_cflags)', ],
         },
         'msvs_settings': {
           'VCCLCompilerTool': {
             'Optimization': '<(win_debug_Optimization)',
             'PreprocessorDefinitions': ['_DEBUG'],
             'BasicRuntimeChecks': '<(win_debug_RuntimeChecks)',
@@ skipping 52 matching lines @@
                   '<(win_release_InlineFunctionExpansion)',
               }],
             ],
           },
           'VCLinkerTool': {
             'LinkIncremental': '1',
           },
         },
         'conditions': [
           ['release_valgrind_build==0', {
-            'defines': ['NVALGRIND'],
+            'defines': ['NVALGRIND', 'DYNAMIC_ANNOTATIONS_ENABLED=0'],
+          }, {
+            'defines': ['DYNAMIC_ANNOTATIONS_ENABLED=1'],
           }],
           ['win_use_allocator_shim==0', {
             'defines': ['NO_TCMALLOC'],
           }],
           ['win_release_RuntimeLibrary==2', {
             # Visual C++ 2008 barfs when building anything with /MD (msvcrt):
             #  VC\include\typeinfo(139) : warning C4275: non dll-interface
             #  class 'stdext::exception' used as base for dll-interface
             #  class 'std::bad_cast'
             'msvs_disabled_warnings': [4275],
@@ skipping 642 matching lines @@
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: