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

vm/code_patcher_x64_test.cc

Index: vm/code_patcher_x64_test.cc
===================================================================
--- vm/code_patcher_x64_test.cc	(revision 9791)
+++ vm/code_patcher_x64_test.cc	(working copy)
@@ -50,7 +50,8 @@
   const String& function_name =
       String::ZoneHandle(String::NewSymbol("callerFunction"));
   const Function& function = Function::ZoneHandle(
-      Function::New(function_name, RawFunction::kFunction, true, false, 0));
+      Function::New(function_name, RawFunction::kRegularFunction,
+                    true, false, 0));
 
   const String& target_name = String::Handle(String::New("targetFunction"));
   ICData& ic_data = ICData::ZoneHandle(