- Refactor the isolate callback mechanism to also include creation of the

vm/isolate.h

Index: vm/isolate.h
===================================================================
--- vm/isolate.h	(revision 1771)
+++ vm/isolate.h	(working copy)
@@ -186,13 +186,6 @@
 #endif
   }
 
-  void set_init_callback_data(void* value) {
-    init_callback_data_ = value;
-  }
-  void* init_callback_data() const {
-    return init_callback_data_;
-  }
-
   Dart_LibraryTagHandler library_tag_handler() const {
     return library_tag_handler_;
   }
@@ -200,8 +193,8 @@
     library_tag_handler_ = value;
   }
 
-  static void SetInitCallback(Dart_IsolateInitCallback callback);
-  static Dart_IsolateInitCallback InitCallback();
+  static void SetCreateAndInitCallback(Dart_IsolateCreateAndInitCallback cback);
+  static Dart_IsolateCreateAndInitCallback CreateAndInitCallback();
 
   uword stack_limit_address() const {
     return reinterpret_cast<uword>(&stack_limit_);
@@ -254,7 +247,6 @@
   int32_t random_seed_;
   BigintStore* bigint_store_;
   uword top_exit_frame_info_;
-  void* init_callback_data_;
   Dart_LibraryTagHandler library_tag_handler_;
   ApiState* api_state_;
   StubCode* stub_code_;
@@ -265,7 +257,7 @@
   uword stack_limit_on_overflow_exception_;
   intptr_t ast_node_id_;
 
-  static Dart_IsolateInitCallback init_callback_;
+  static Dart_IsolateCreateAndInitCallback create_init_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(Isolate);
 };