commit 80d418c6c40663ecce0eefb81b790c6af2066a01
author James Robinson <jamesr@chromium.org> Thu Oct 16 16:00:02 2014 -0700
committer James Robinson <jamesr@chromium.org> Thu Oct 16 16:00:02 2014 -0700
tree 913febd085f6b6500b75516345be0122799aa957
parent 730d7b3d79bb2a354ce4cc42f30dc559a5a297bf

Revved to chromium 2a04445358913b81ed786927172647b701b73113 refs/remotes/origin/HEAD

testing/test_env.py

diff --git a/testing/test_env.py b/testing/test_env.py
index 0539309..574aaed 100755
--- a/testing/test_env.py
+++ b/testing/test_env.py
@@ -81,10 +81,7 @@
   extra_env = {}
 
   # Instruct GTK to use malloc while running ASan or LSan tests.
-  # TODO(earthdok): enabling G_SLICE gives these leaks, locally and on swarming
-  #0 0x62c01b in __interceptor_malloc (/tmp/run_tha_testXukBDT/out/Release/browser_tests+0x62c01b)
-  #1 0x7fb64ab64a38 in g_malloc /build/buildd/glib2.0-2.32.4/./glib/gmem.c:159
-  #extra_env['G_SLICE'] = 'always-malloc'
+  extra_env['G_SLICE'] = 'always-malloc'
 
   extra_env['NSS_DISABLE_ARENA_FREE_LIST'] = '1'
   extra_env['NSS_DISABLE_UNLOAD'] = '1'