Remove old flags from about:flags and add new ones instead.

chrome/browser/about_flags.cc

 // 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.
 
 #include "chrome/browser/about_flags.h"
 
 #include <algorithm>
 #include <iterator>
 #include <map>
 #include <set>
@@ skipping 331 matching lines @@
   // TODO(halyavin): When exception handling is on by default, replace this
   // flag with disable-nacl-exception-handling.
   {
     "enable-nacl-exception-handling",  // FLAGS:RECORD_UMA
     IDS_FLAGS_ENABLE_NACL_EXCEPTION_HANDLING_NAME,
     IDS_FLAGS_ENABLE_NACL_EXCEPTION_HANDLING_DESCRIPTION,
     kOsAll,
     SINGLE_VALUE_TYPE(switches::kEnableNaClExceptionHandling)
   },
   {
-    "nacl-gdb",  // FLAGS:RECORD_UMA
-    IDS_FLAGS_NACL_GDB_NAME,
-    IDS_FLAGS_NACL_GDB_DESCRIPTION,
-    kOsWin,
-    SINGLE_VALUE_TYPE(switches::kNaClGdb)
-  },
-  {
-    "nacl-gdb-script",  // FLAGS:RECORD_UMA
-    IDS_FLAGS_NACL_GDB_SCRIPT_NAME,
-    IDS_FLAGS_NACL_GDB_SCRIPT_DESCRIPTION,
-    kOsAll,
-    SINGLE_VALUE_TYPE(switches::kNaClGdbScript)
+    "enable-nacl-debug",  // FLAGS:RECORD_UMA
+    IDS_FLAGS_ENABLE_NACL_DEBUG_NAME,
+    IDS_FLAGS_ENABLE_NACL_DEBUG_DESCRIPTION,
+    kOsWin | kOsLinux | kOsCrOS,

[Mark Seaborn, 2012/08/31 20:10:18]

Let's just put kOsAll.  Mac support will be done soon.  There's no need to
create extra work for changing this later -- we're likely to forget.

[halyavin, 2012/09/03 12:04:39]

Done.

+    SINGLE_VALUE_TYPE(switches::kEnableNaClDebug)
   },
   {
     "enable-pnacl",  // FLAGS:RECORD_UMA
     IDS_FLAGS_ENABLE_PNACL_NAME,
     IDS_FLAGS_ENABLE_PNACL_DESCRIPTION,
     kOsAll,
     SINGLE_VALUE_TYPE(switches::kEnablePnacl)
   },
   {
     "extension-apis",  // FLAGS:RECORD_UMA
@@ skipping 978 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags