Linux sandbox: Allow seccomp sandbox to be stacked on top of the SUID sandbox
Linux sandbox: Allow seccomp sandbox to be stacked on top of the SUID sandbox

Since this mostly worked before, this is just a matter of reordering
some "if" clauses.

Before this change, --enable-seccomp-sandbox would have the side
effect of disabling the SUID sandbox.  The zygote would get run
through the SUID helper, but the zygote would never send the message
to turn the SUID sandbox on.

Change this so that --enable-seccomp-sandbox does not disable the SUID
sandbox.

BUG=55599
TEST=Tested manually with:
  cd native_client && ./tools/httpd.py &
  CHROME_DEVEL_SANDBOX=/opt/google/chrome/chrome-sandbox ./out/Debug/chrome-wrapper --enable-nacl --enable-seccomp-sandbox http://localhost:5103/tests/prebuilt/srpc_hw.html

Review URL: http://codereview.chromium.org/3449001

git-svn-id: http://src.chromium.org/svn/trunk/src@59630 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

Former-commit-id: f3c1dd9a45c609ae6535f5b94b478a147901c063
meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser