Renaming type classes as discussed:

runtime/vm/scopes.h

 // 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.
 
 #ifndef VM_SCOPES_H_
 #define VM_SCOPES_H_
 
 #include "vm/allocation.h"
 #include "vm/assembler.h"
 #include "vm/growable_array.h"
 
 namespace dart {
 
 class LocalScope;
 class LocalVariable;
 class SourceLabel;
 
 
 class LocalVariable : public ZoneAllocated {
  public:
-  LocalVariable(intptr_t token_index, const String& name, const Type& type)
+  LocalVariable(intptr_t token_index,
+                const String& name,
+                const AbstractType& type)
     : token_index_(token_index),
       name_(name),
       owner_(NULL),
       type_(type),
       is_final_(false),
       is_captured_(false),
       is_invisible_(false),
       index_(LocalVariable::kUnitializedIndex_) {
     ASSERT(type.IsZoneHandle());
     ASSERT(type.IsFinalized());
   }
 
   intptr_t token_index() const { return token_index_; }
   const String& name() const { return name_; }
   LocalScope* owner() const { return owner_; }
   void set_owner(LocalScope* owner) {
     ASSERT(owner_ == NULL);
     owner_ = owner;
   }
 
-  const Type& type() const { return type_; }
+  const AbstractType& type() const { return type_; }
 
   bool is_final() const { return is_final_; }
   void set_is_final() { is_final_ = true; }
 
   bool is_captured() const { return is_captured_; }
   void set_is_captured() { is_captured_ = true; }
 
   bool HasIndex() const {
     return index_ != kUnitializedIndex_;
   }
@@ skipping 11 matching lines @@
     is_invisible_ = value;
   }
 
  private:
   static const int kUnitializedIndex_ = INT_MIN;
 
   const intptr_t token_index_;
   const String& name_;
   LocalScope* owner_;  // Local scope declaring this variable.
 
-  const Type& type_;  // Declaration type of local variable.
+  const AbstractType& type_;  // Declaration type of local variable.
 
   bool is_final_;  // If true, this variable is readonly.
   bool is_captured_;  // If true, this variable lives in the context, otherwise
                       // in the stack frame.
   bool is_invisible_;
   int index_;  // Allocation index in words relative to frame pointer (if not
                // captured), or relative to the context pointer (if captured).
 
   friend class LocalScope;
   DISALLOW_COPY_AND_ASSIGN(LocalVariable);
@@ skipping 193 matching lines @@
   int num_context_variables_;  // Only set if this scope is a context owner.
   GrowableArray<LocalVariable*> variables_;
   GrowableArray<SourceLabel*> labels_;
 
   DISALLOW_COPY_AND_ASSIGN(LocalScope);
 };
 
 }  // namespace dart
 
 #endif  // VM_SCOPES_H_