Refactor service code and service method parameters

runtime/vm/dart.cc

Index: runtime/vm/dart.cc
diff --git a/runtime/vm/dart.cc b/runtime/vm/dart.cc
index 2d8604451dd3885165ed7b7a5af8ba5d42891e1b..20d734019a301d948a896a671b305badea499532 100644
--- a/runtime/vm/dart.cc
+++ b/runtime/vm/dart.cc
@@ -20,7 +20,7 @@
 #include "vm/object_id_ring.h"
 #include "vm/port.h"
 #include "vm/profiler.h"
-#include "vm/service.h"
+#include "vm/service_isolate.h"
 #include "vm/simulator.h"
 #include "vm/snapshot.h"
 #include "vm/stub_code.h"
@@ -146,7 +146,7 @@ const char* Dart::InitOnce(Dart_IsolateCreateCallback create,
   Isolate::SetUnhandledExceptionCallback(unhandled);
   Isolate::SetShutdownCallback(shutdown);
 
-  Service::RunService();
+  ServiceIsolate::Run();
 
   return NULL;
 }
@@ -261,9 +261,9 @@ RawError* Dart::InitializeIsolate(const uint8_t* snapshot_buffer, void* data) {
     isolate->class_table()->Print();
   }
 
-  Service::MaybeInjectVMServiceLibrary(isolate);
+  ServiceIsolate::MaybeInjectVMServiceLibrary(isolate);
 
-  Service::SendIsolateStartupMessage();
+  ServiceIsolate::SendIsolateStartupMessage();
   isolate->debugger()->NotifyIsolateCreated();
 
   // Create tag table.
@@ -281,7 +281,7 @@ void Dart::RunShutdownCallback() {
   Isolate* isolate = Isolate::Current();
   void* callback_data = isolate->init_callback_data();
   Dart_IsolateShutdownCallback callback = Isolate::ShutdownCallback();
-  Service::SendIsolateShutdownMessage();
+  ServiceIsolate::SendIsolateShutdownMessage();
   if (callback != NULL) {
     (callback)(callback_data);
   }