Fixed bad calculations for determining total allocated size of a zone.

runtime/vm/zone_test.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 "platform/assert.h"
 #include "vm/dart.h"
 #include "vm/isolate.h"
 #include "vm/unit_test.h"
 #include "vm/zone.h"
 
@@ skipping 183 matching lines @@
     {
       JSONStream stream;
       // Get the JSON formated zone information.
       zone.GetZone()->PrintJSON(&stream);
       const char* json = stream.ToCString();
       // Ensure that  matches actual values.
       char* size_buf =
           OS::SCreate(string_stack_zone.GetZone(), "\"capacity\":%" Pd
                                                    ","
                                                    "\"used\":%" Pd "",
-                      zone.SizeInBytes(), zone.UsedSizeInBytes());
+                      zone.CapacityInBytes(), zone.SizeInBytes());
+      EXPECT_LE(zone.SizeInBytes(), zone.CapacityInBytes());
       EXPECT_SUBSTRING(size_buf, json);
     }
 
     // Expand the zone to ensure that JSON is updated accordingly.
     zone.GetZone()->Alloc<uint32_t>(kNumElements);
     allocated_size += sizeof(uint32_t) * kNumElements;
     EXPECT_LE(allocated_size, zone.SizeInBytes());
     {
       JSONStream stream;
       zone.GetZone()->PrintJSON(&stream);
       const char* json = stream.ToCString();
       char* size_buf =
           OS::SCreate(string_stack_zone.GetZone(), "\"capacity\":%" Pd
                                                    ","
                                                    "\"used\":%" Pd "",
-                      zone.SizeInBytes(), zone.UsedSizeInBytes());
+                      zone.CapacityInBytes(), zone.SizeInBytes());
+      EXPECT_LE(zone.SizeInBytes(), zone.CapacityInBytes());
       EXPECT_SUBSTRING(size_buf, json);
     }
   }
   EXPECT(thread->zone() == NULL);
   Dart_ShutdownIsolate();
 }
 #endif
 
 }  // namespace dart