Service isolate rework take 2

runtime/vm/isolate.cc

Index: runtime/vm/isolate.cc
diff --git a/runtime/vm/isolate.cc b/runtime/vm/isolate.cc
index 583bdec5aa14a29a3d85de954f8570f2f712f71b..b5bb318f1d61bbb1e2492ab31f5224a5a798dc0e 100644
--- a/runtime/vm/isolate.cc
+++ b/runtime/vm/isolate.cc
@@ -554,7 +554,7 @@ Isolate::Isolate(Isolate* original)
 #undef REUSABLE_HANDLE_INITIALIZERS
 
 Isolate::~Isolate() {
-  delete [] name_;
+  free(name_);
   delete heap_;
   delete object_store_;
   delete api_state_;
@@ -682,9 +682,13 @@ void Isolate::BuildName(const char* name_prefix) {
   if (name_prefix == NULL) {
     name_prefix = "isolate";
   }
+  if (Service::IsServiceIsolateName(name_prefix)) {
+    name_ = strdup(name_prefix);
+    return;
+  }
   const char* kFormat = "%s-%lld";
   intptr_t len = OS::SNPrint(NULL, 0, kFormat, name_prefix, main_port()) + 1;
-  name_ = new char[len];
+  name_ = reinterpret_cast<char*>(malloc(len));
   OS::SNPrint(name_, len, kFormat, name_prefix, main_port());
 }
 
@@ -1143,7 +1147,6 @@ Dart_FileWriteCallback Isolate::file_write_callback_ = NULL;
 Dart_FileCloseCallback Isolate::file_close_callback_ = NULL;
 Dart_EntropySource Isolate::entropy_source_callback_ = NULL;
 Dart_IsolateInterruptCallback Isolate::vmstats_callback_ = NULL;
-Dart_ServiceIsolateCreateCalback Isolate::service_create_callback_ = NULL;
 
 Monitor* Isolate::isolates_list_monitor_ = NULL;
 Isolate* Isolate::isolates_list_head_ = NULL;