Implement the memory leak annotations for heap leak checker.

base/base.gyp

 # Copyright (c) 2009 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
@@ skipping 146 matching lines @@
         'json/json_writer.h',
         'json/string_escape.cc',
         'json/string_escape.h',
         'keyboard_code_conversion_gtk.cc',
         'keyboard_code_conversion_gtk.h',
         'keyboard_codes.h',
         'keyboard_codes_win.h',
         'keyboard_codes_posix.h',
         'lazy_instance.cc',
         'lazy_instance.h',
+        'leak_annotations.h',
         'leak_tracker.h',
         'linked_list.h',
         'linked_ptr.h',
         'linux_util.cc',
         'linux_util.h',
         'lock.cc',
         'lock.h',
         'lock_impl.h',
         'lock_impl_posix.cc',
         'lock_impl_win.cc',
@@ skipping 194 matching lines @@
       'msvs_disabled_warnings': [
         4244, 4554, 4018, 4102,
       ],
       'mac_framework_dirs': [
         '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework/Frameworks',
       ],
       'conditions': [
         [ 'OS == "linux" or OS == "freebsd"', {
             'sources/': [ ['exclude', '_(mac|win|chromeos)\\.cc$'],
                           ['exclude', '\\.mm?$' ] ],
+            'variables' : {
+              'linux_use_heapchecker%' : 0,
+            },
             'conditions': [
               [ 'chromeos==1 or toolkit_views==1', {
                   'sources/': [ ['include', '_chromeos\\.cc$'] ]
                 },
               ],
-              [ 'linux_use_tcmalloc==1', {
+              [ 'linux_use_heapchecker==1', {
+                  'defines': [
+                    'LINUX_USE_HEAPCHECKER',
+                  ],
+                  'direct_dependent_settings': {
+                    'defines': [
+                      'LINUX_USE_HEAPCHECKER',
+                    ],
+                  },
+                },
+              ],
+              # linux_use_heapchecker==1 implies linux_use_tcmalloc=1.
+              [ 'linux_use_tcmalloc==1 or linux_use_heapchecker==1', {
                   'dependencies': [
                     '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
                   ],
+                  'defines': [
+                    'LINUX_USE_TCMALLOC',
+                  ],
+                  'direct_dependent_settings': {
+                    'defines': [
+                      'LINUX_USE_TCMALLOC',
+                    ],
+                  },
                 },
               ],
             ],
             'dependencies': [
               '../build/util/build_util.gyp:lastchange',
               '../build/linux/system.gyp:gtk',
               '../build/linux/system.gyp:nss',
             ],
             'cflags': [
               '-Wno-write-strings',
@@ skipping 437 matching lines @@
       ],
     }],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: