Renaming type classes as discussed:

runtime/vm/scopes.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/scopes.h"
 
 #include "vm/ast.h"
 #include "vm/object.h"
 
 namespace dart {
@@ skipping 353 matching lines @@
 }
 
 
 LocalScope* LocalScope::RestoreOuterScope(const ContextScope& context_scope) {
   LocalScope* outer_scope = new LocalScope(NULL, 0, 0);
   // Add all variables as aliases to the outer scope.
   for (int i = 0; i < context_scope.num_variables(); i++) {
     LocalVariable* variable =
         new LocalVariable(context_scope.TokenIndexAt(i),
                           String::ZoneHandle(context_scope.NameAt(i)),
-                          Type::ZoneHandle(context_scope.TypeAt(i)));
+                          AbstractType::ZoneHandle(context_scope.TypeAt(i)));
     variable->set_is_captured();
     variable->set_index(context_scope.ContextIndexAt(i));
     if (context_scope.IsFinalAt(i)) {
       variable->set_is_final();
     }
     // Create a fake owner scope describing the index and context level of the
     // variable. Function level and loop level are unused (set to 0), since
     // context level has already been assigned.
     LocalScope* owner_scope = new LocalScope(NULL, 0, 0);
     owner_scope->set_context_level(context_scope.ContextLevelAt(i));
@@ skipping 10 matching lines @@
 
   // Create a ContextScope with space for kNumCapturedVars descriptors.
   const ContextScope& context_scope =
       ContextScope::Handle(ContextScope::New(kNumCapturedVars));
 
   // Create a descriptor for 'this' variable.
   const String& name = String::Handle(String::NewSymbol("this"));
   context_scope.SetTokenIndexAt(0, func.token_index());
   context_scope.SetNameAt(0, name);
   context_scope.SetIsFinalAt(0, true);
-  const Type& type = Type::Handle(func.ParameterTypeAt(0));
+  const AbstractType& type = AbstractType::Handle(func.ParameterTypeAt(0));
   context_scope.SetTypeAt(0, type);
   context_scope.SetContextIndexAt(0, 0);
   context_scope.SetContextLevelAt(0, 0);
   ASSERT(context_scope.num_variables() == kNumCapturedVars);  // Verify count.
   return context_scope.raw();
 }
 
 }  // namespace dart