Rename some of the enum definitions inside classes to avoid conflict with the ObjectKind enum.

vm/resolver_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/assembler.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
 #include "vm/dart_entry.h"
 #include "vm/object.h"
@@ skipping 23 matching lines @@
               "  %s %s(String s, int i) { return i; }\n"
               "}\n",
               test_class_name,
               is_static ? "static" : "",
               test_static_function_name);
 
   String& url = String::Handle(is_static ?
                                String::New("dart-test:DartStaticResolve") :
                                String::New("dart-test:DartDynamicResolve"));
   String& source = String::Handle(String::New(script_chars));
-  Script& script = Script::Handle(Script::New(url, source, RawScript::kScript));
+  Script& script = Script::Handle(Script::New(url,
+                                              source,
+                                              RawScript::kScriptTag));
   const String& lib_name = String::Handle(String::New(test_library_name));
   Library& lib = Library::Handle(Library::New(lib_name));
   lib.Register();
   EXPECT(CompilerTest::TestCompileScript(lib, script));
   EXPECT(ClassFinalizer::FinalizePendingClasses());
 }
 
 
 // Setup a static function for invocation.
 static void SetupStaticFunction(const char* test_library_name,
@@ skipping 164 matching lines @@
                                  super_function_name,
                                  kNumPositionalArguments,
                                  kNumNamedArguments));
     EXPECT(!super_function.IsNull());
   }
 }
 
 #endif  // defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64).
 
 }  // namespace dart