Rework the format of the FlagList response.

runtime/vm/flags.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/flags.h"
 
 #include "platform/assert.h"
 #include "vm/json_stream.h"
 #include "vm/os.h"
 
@@ skipping 409 matching lines @@
 }
 
 
 void Flags::PrintFlagToJSONArray(JSONArray* jsarr, const Flag* flag) {
   if (flag->IsUnrecognized() || flag->type_ == Flag::kFunc) {
     return;
   }
   JSONObject jsflag(jsarr);
   jsflag.AddProperty("name", flag->name_);
   jsflag.AddProperty("comment", flag->comment_);
+  jsflag.AddProperty("modified", flag->changed_);
   switch (flag->type_) {
     case Flag::kBoolean: {
       jsflag.AddProperty("_flagType", "Bool");
       jsflag.AddProperty("valueAsString",
                          (*flag->bool_ptr_ ? "true" : "false"));
       break;
     }
     case Flag::kInteger: {
       jsflag.AddProperty("_flagType", "Int");
       jsflag.AddPropertyF("valueAsString", "%d", *flag->int_ptr_);
@@ skipping 16 matching lines @@
     default:
       UNREACHABLE();
       break;
   }
 }
 
 
 void Flags::PrintJSON(JSONStream* js) {
   JSONObject jsobj(js);
   jsobj.AddProperty("type", "FlagList");
-  {
-    JSONArray jsarr(&jsobj, "unmodifiedFlags");
-    for (intptr_t i = 0; i < num_flags_; ++i) {
-      Flag* flag = flags_[i];
-      if (!flag->changed_) {
-        PrintFlagToJSONArray(&jsarr, flag);
-      }
-    }
-  }
-  {
-    JSONArray jsarr(&jsobj, "modifiedFlags");
-    for (intptr_t i = 0; i < num_flags_; ++i) {
-      Flag* flag = flags_[i];
-      if (flag->changed_) {
-        PrintFlagToJSONArray(&jsarr, flag);
-      }
-    }
+  JSONArray jsarr(&jsobj, "flags");
+  for (intptr_t i = 0; i < num_flags_; ++i) {
+    PrintFlagToJSONArray(&jsarr, flags_[i]);
   }
 }
 
 }  // namespace dart