GTTF: No more FLAKY_ .

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() {}
 
 SandboxStatusUITest.prototype = {
   __proto__: testing.Test.prototype,
   /**
    * Browse to the options page & call our preLoad().
    */
   browsePreload: 'chrome://sandbox',
 
 };
 
 // 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 DISABLE THIS TEST. If you can't figure out how to
-//   get the SUID sandbox installed, please mark the test FLAKY_ so we
-//   can get clear information on where the sandbox is and isn't installed.
+// - 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('#else');
 GEN('# define MAYBE_testSUIDSandboxEnabled \\');
 GEN('     DISABLED_testSUIDSandboxEnabled');
 GEN('#endif');
 
 /**
  * Test if the SUID sandbox is enabled.
  *
- * TODO(bradchen): Remove FLAKY_ and flip polarity of this test once
+ * TODO(bradchen): Remove DISABLED_ and flip polarity of this test once
  * the SUID sandbox is enabled on the Chromium bots. In the mean time
  * this test will make it clear that the enabling steps are effective.
  */
 TEST_F('SandboxStatusUITest', 'MAYBE_testSUIDSandboxEnabled', function() {
     var suidyesstring = 'SUID Sandbox\tYes';
     var suidnostring = 'SUID Sandbox\tNo';
     var suidyes = document.body.innerText.match(suidyesstring);
     var suidno = document.body.innerText.match(suidnostring);
 
     expectEquals(null, suidno);
     assertFalse(suidyes === null);
     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('     FLAKY_testBPFSandboxEnabled');
+GEN('     DISABLED_testBPFSandboxEnabled');
 GEN('#else');
 GEN('# define MAYBE_testBPFSandboxEnabled \\');
 GEN('     DISABLED_testBPFSandboxEnabled');
 GEN('#endif');
 
 /**
  * Test if the seccomp-bpf sandbox is enabled.
  * We know that some machines lack kernel support for this. So we mark
- * it as FLAKY_.
+ * it as DISABLED_.
  * It's very convenient to quickly be able to check whether tests ran with
  * or without the Seccomp BPF sandbox through this mechanism.
  */
 TEST_F('SandboxStatusUITest', 'MAYBE_testBPFSandboxEnabled', function() {
     var bpfyesstring = 'Seccomp-BPF sandbox\tYes';
     var bpfnostring = 'Seccomp-BPF sandbox\tNo';
     var bpfyes = document.body.innerText.match(bpfyesstring);
     var bpfno = document.body.innerText.match(bpfnostring);
 
     expectEquals(null, bpfno);
     assertFalse(bpfyes === null);
     expectEquals(bpfyesstring, bpfyes[0]);
 });