Renaming type classes as discussed:

runtime/vm/flags.cc

 // Copyright (c) 2011, 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 "vm/assert.h"
 #include "vm/os.h"
 
 namespace dart {
 
 DEFINE_FLAG(bool, print_flags, false, "Print flags as they are being parsed.");
 DEFINE_FLAG(bool, ignore_unrecognized_flags, false,
     "Ignore unrecognized flags.");
 
 // List of registered flags.
 Flag* Flags::flags_ = NULL;
 
 class Flag {
  public:
-  enum Type {
+  enum FlagType {
     kBoolean,
     kInteger,
     kString,
     kNumFlagTypes
   };
 
-  Flag(const char* name, const char* comment, void* addr, Type type)
+  Flag(const char* name, const char* comment, void* addr, FlagType type)
       : name_(name), comment_(comment), addr_(addr), type_(type) {
   }
 
   void Print() {
     if (IsUnrecognized()) {
       OS::Print("%s: unrecognized\n", name_);
       return;
     }
     switch (type_) {
       case kBoolean: {
@@ skipping 25 matching lines @@
 
   Flag* next_;
   const char* name_;
   const char* comment_;
   union {
     void* addr_;
     bool* bool_ptr_;
     int* int_ptr_;
     charp* charp_ptr_;
   };
-  Type type_;
+  FlagType type_;
 };
 
 
 Flag* Flags::Lookup(const char* name) {
   Flag* cur = Flags::flags_;
   while (cur != NULL) {
     if (strcmp(cur->name_, name) == 0) {
       return cur;
     }
     cur = cur->next_;
@@ skipping 176 matching lines @@
     OS::Print("Flag settings:\n");
     Flag* flag = Flags::flags_;
     while (flag != NULL) {
       flag->Print();
       flag = flag->next_;
     }
   }
 }
 
 }  // namespace dart