Valgrind: Do not use the sandbox for layout tests.

tools/valgrind/valgrind_test.py

 # Copyright (c) 2012 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.
 
 """Runs an exe through Valgrind and puts the intermediate files in a
 directory.
 """
 
 import datetime
 import glob
@@ skipping 372 matching lines @@
       logging.warning("WARNING: NOT USING SUPPRESSIONS!")
 
     logfilename = self.log_dir + ("/%s." % tool_name) + "%p"
     if self.UseXML():
       proc += ["--xml=yes", "--xml-file=" + logfilename]
     else:
       proc += ["--log-file=" + logfilename]
 
     # The Valgrind command is constructed.
 
+    # Valgrind doesn't play nice with the Chrome sandbox.  Empty this env var
+    # set by runtest.py to disable the sandbox.
+    if os.environ.get("CHROME_DEVEL_SANDBOX", None):
+      logging.info("Removing CHROME_DEVEL_SANDBOX fron environment")
+      os.environ["CHROME_DEVEL_SANDBOX"] = ''
+
     # Handle --indirect_webkit_layout separately.
     if self._options.indirect_webkit_layout:
       # Need to create the wrapper before modifying |proc|.
       wrapper = self.CreateBrowserWrapper(proc, webkit=True)
       proc = self._args
       proc.append("--wrapper")
       proc.append(wrapper)
       return proc
 
-    # Valgrind doesn't play nice with the Chrome sandbox.  Empty this env var
-    # set by runtest.py to disable the sandbox.
-    if os.environ.get("CHROME_DEVEL_SANDBOX", None):
-      logging.info("Removing CHROME_DEVEL_SANDBOX fron environment")
-      os.environ["CHROME_DEVEL_SANDBOX"] = ''
-
     if self._options.indirect:
       wrapper = self.CreateBrowserWrapper(proc)
       os.environ["BROWSER_WRAPPER"] = wrapper
       logging.info('export BROWSER_WRAPPER=' + wrapper)
       proc = []
     proc += self._args
     return proc
 
   def ToolSpecificFlags(self):
     raise NotImplementedError, "This method should be implemented " \
@@ skipping 799 matching lines @@
       return Asan()
     try:
       platform_name = common.PlatformNames()[0]
     except common.NotImplementedError:
       platform_name = sys.platform + "(Unknown)"
     raise RuntimeError, "Unknown tool (tool=%s, platform=%s)" % (tool_name,
                                                                  platform_name)
 
 def CreateTool(tool):
   return ToolFactory().Create(tool)