Linux: Undo a bit of tcmalloc gyp change from r49597....

base/base.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.
 
 {
   'target_defaults': {
     'variables': {
       'base_target': 0,
       'base_extra_target': 0,
     },
@@ skipping 445 matching lines @@
           'version.cc',
           'version.h',
         ],
         'conditions': [
           [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
             'conditions': [
               [ 'chromeos==1', {
                   'sources/': [ ['include', '_chromeos\\.cc$'] ]
                 },
               ],
-              [ 'linux_use_tcmalloc==0', {
-                  'defines': [
-                    'NO_TCMALLOC',
-                  ],
-                  'direct_dependent_settings': {
-                    'defines': [
-                      'NO_TCMALLOC',
-                    ],
-                  },
-                },
-              ],
             ],
             'defines': [
               'USE_SYMBOLIZE',
             ],
             'cflags': [
               '-Wno-write-strings',
             ],
           },],
           [ 'OS != "win"', {
               'sources!': [
@@ skipping 36 matching lines @@
       # TODO(gregoryd): direct_dependent_settings should be shared with the
       #  64-bit target, but it doesn't work due to a bug in gyp
       'direct_dependent_settings': {
         'include_dirs': [
           '..',
         ],
       },
       'conditions': [
         [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
           'conditions': [
+            [ 'linux_use_tcmalloc==0', {
+                'defines': [
+                  'NO_TCMALLOC',
+                ],
+                'direct_dependent_settings': {
+                  'defines': [
+                    'NO_TCMALLOC',
+                  ],
+                },
+              },
+            ],
             [ 'linux_use_tcmalloc==1', {
                 'dependencies': [
                   'allocator/allocator.gyp:allocator',
                 ],
               },
             ],
           ],
           'dependencies': [
             'symbolize',
             '../build/util/build_util.gyp:lastchange',
@@ skipping 188 matching lines @@
             'third_party/xdg_mime/xdgmimemagic.c',
             'third_party/xdg_mime/xdgmimemagic.h',
             'third_party/xdg_mime/xdgmimeparent.c',
             'third_party/xdg_mime/xdgmimeparent.h',
           ],
         },
       ],
     }],
   ],
 }