Valgrind: Do not use the sandbox for layout tests.

Recently layout tests changed to use content_shell instead of DRT. Content_shell attempts to use the sandbox if it can, and that made the Valgrind layout test bot unhappy. All other Valgrind bots disable the sandbox, and layout tests should too.

TBR=timurrrr@chromium.org
NOTRY=true

Review URL: https://chromiumcodereview.appspot.com/16087005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202732 0039d316-1c4b-4281-b951-d872f2087c98

tools/valgrind/valgrind_test.py

@@ -390,6 +390,12 @@ class ValgrindTool(BaseTool):
 
     # 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|.
@@ -399,12 +405,6 @@ class ValgrindTool(BaseTool):
       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