Service isolate rework

runtime/vm/service.h

Index: runtime/vm/service.h
diff --git a/runtime/vm/service.h b/runtime/vm/service.h
index ec3a807ad30c2bc0f0a418bce2f5d3f56770123f..d73f9b1a06e21b168663e4f7754ce98e8a436e3c 100644
--- a/runtime/vm/service.h
+++ b/runtime/vm/service.h
@@ -72,6 +72,10 @@ class Service : public AllStatic {
 
   static void SendEchoEvent(Isolate* isolate);
 
+  static void MaybeInjectVMServiceLibrary(Isolate* isolate);
+
+  static void RunService();
+
  private:
   // These must be kept in sync with service/constants.dart
   static const int kEventFamilyDebug = 0;
@@ -81,11 +85,13 @@ class Service : public AllStatic {
 
   static void EmbedderHandleMessage(EmbedderServiceHandler* handler,
                                     JSONStream* js);
+
   static EmbedderServiceHandler* FindIsolateEmbedderHandler(const char* name);
   static EmbedderServiceHandler* FindRootEmbedderHandler(const char* name);
   static Dart_Handle GetSource(const char* name);
   static Dart_Handle LibraryTagHandler(Dart_LibraryTag tag, Dart_Handle library,
                                        Dart_Handle url);
+
   static void SendEvent(intptr_t eventId, const Object& eventMessage);
   // Does not take ownership of 'data'.
   static void SendEvent(intptr_t eventId,
@@ -97,7 +103,6 @@ class Service : public AllStatic {
   static EmbedderServiceHandler* root_service_handler_head_;
 
   static Isolate* service_isolate_;
-  static Dart_LibraryTagHandler embedder_provided_handler_;
   static Dart_Port port_;
   static uint32_t event_mask_;
 };