Corrected resubmssion of r34736.

runtime/vm/heap.h

 // 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.
 
 #ifndef VM_HEAP_H_
 #define VM_HEAP_H_
 
 #include "platform/assert.h"
 #include "vm/allocation.h"
 #include "vm/flags.h"
 #include "vm/globals.h"
 #include "vm/pages.h"
 #include "vm/scavenger.h"
+#include "vm/spaces.h"
 #include "vm/weak_table.h"
 
 namespace dart {
 
 // Forward declarations.
 class Isolate;
 class ObjectPointerVisitor;
 class ObjectSet;
 class VirtualMemory;
 
@@ skipping 227 matching lines @@
    public:
     GCStats() {}
     intptr_t num_;
     Heap::Space space_;
     Heap::GCReason reason_;
 
     class Data : public ValueObject {
     public:
       Data() {}
       int64_t micros_;
-      intptr_t new_used_in_words_;
-      intptr_t new_capacity_in_words_;
-      intptr_t new_external_in_words_;
-      intptr_t old_used_in_words_;
-      intptr_t old_capacity_in_words_;
-      intptr_t old_external_in_words_;
+      SpaceUsage new_;
+      SpaceUsage old_;
     private:
       DISALLOW_COPY_AND_ASSIGN(Data);
     };
 
     enum {
       kDataEntries = 4
     };
 
     Data before_;
     Data after_;
@@ skipping 61 matching lines @@
   NoHeapGrowthControlScope();
   ~NoHeapGrowthControlScope();
  private:
   bool current_growth_controller_state_;
   DISALLOW_COPY_AND_ASSIGN(NoHeapGrowthControlScope);
 };
 
 }  // namespace dart
 
 #endif  // VM_HEAP_H_