Add namespace sandbox to about page.

chrome/test/data/webui/sandboxstatus_browsertest.js

 // 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.
 
 /**
  * TestFixture for SUID Sandbox testing.
  * @extends {testing.Test}
  * @constructor
  */
 function SandboxStatusUITest() {}
@@ skipping 10 matching lines @@
 // This test is for Linux only.
 // PLEASE READ:
 // - If failures of this test are a problem on a bot under your care,
 //   the proper way to address such failures is to install the SUID
 //   sandbox. See:
 //     http://code.google.com/p/chromium/wiki/LinuxSUIDSandboxDevelopment
 // - PLEASE DO NOT GLOBALLY DISABLE THIS TEST.
 // SUID sandbox is currently incompatible with AddressSanitizer,
 // see http://crbug.com/137653.
 GEN('#if defined(OS_LINUX) && !defined(ADDRESS_SANITIZER)');
-GEN('# define MAYBE_testSUIDSandboxEnabled \\');
-GEN('     testSUIDSandboxEnabled');
+GEN('# define MAYBE_testSUIDorNamespaceSandboxEnabled \\');
+GEN('     testSUIDorNamespaceSandboxEnabled');
 GEN('#else');
-GEN('# define MAYBE_testSUIDSandboxEnabled \\');
-GEN('     DISABLED_testSUIDSandboxEnabled');
+GEN('# define MAYBE_testSUIDorNamespaceSandboxEnabled \\');
+GEN('     DISABLED_testSUIDorNamespaceSandboxEnabled');
 GEN('#endif');
 
 /**
  * Test if the SUID sandbox is enabled.
  */
-TEST_F('SandboxStatusUITest', 'MAYBE_testSUIDSandboxEnabled', function() {
+TEST_F('SandboxStatusUITest',
+       'MAYBE_testSUIDorNamespaceSandboxEnabled', function() {
+  var namespaceyesstring = 'Namespace Sandbox\tYes';
+  var namespacenostring = 'Namespace Sandbox\tNo';
   var suidyesstring = 'SUID Sandbox\tYes';
   var suidnostring = 'SUID Sandbox\tNo';
+
   var suidyes = document.body.innerText.match(suidyesstring);
   var suidno = document.body.innerText.match(suidnostring);
+  var namespaceyes = document.body.innerText.match(namespaceyesstring);
+  var namespaceno = document.body.innerText.match(namespacenostring);
 
-  expectEquals(null, suidno);
-  assertFalse(suidyes === null);
-  expectEquals(suidyesstring, suidyes[0]);
+  // Exactly one of the namespace or suid sandbox should be enabled.
+  expectTrue(suidyes !== null || namespaceyes !== null);
+  expectFalse(suidyes !== null && namespaceyes !== null);
+
+  if (namespaceyes !== null) {
+    expectEquals(null, namespaceno);
+    expectEquals(namespaceyesstring, namespaceyes[0]);
+  }
+
+  if (suidyes !== null) {
+    expectEquals(null, suidno);
+    expectEquals(suidyesstring, suidyes[0]);
+  }
 });
 
 // The seccomp-bpf sandbox is also not compatible with ASAN.
 GEN('#if !defined(OS_LINUX) || defined(ADDRESS_SANITIZER)');
 GEN('# define MAYBE_testBPFSandboxEnabled \\');
 GEN('     DISABLED_testBPFSandboxEnabled');
 GEN('#else');
 GEN('# define MAYBE_testBPFSandboxEnabled \\');
 GEN('     testBPFSandboxEnabled');
 GEN('#endif');
@@ skipping 54 matching lines @@
         if (gpuyes || gpuno) {
           expectEquals(null, gpuno);
           expectTrue(gpuyes && (gpuyes[0] == gpuyesstring));
           testDone();
         }
       }
     })
   });
   observer.observe(document.getElementById('basic-info'), {childList: true});
 });