Refactor service code and service method parameters

runtime/vm/dart_api_impl.cc

Index: runtime/vm/dart_api_impl.cc
diff --git a/runtime/vm/dart_api_impl.cc b/runtime/vm/dart_api_impl.cc
index 64b96c805bd422c87c9f5b4cc7469a2afc4c9d7d..a67ed5430a5c5cef5c1a556370ad5ef4bf479e1c 100644
--- a/runtime/vm/dart_api_impl.cc
+++ b/runtime/vm/dart_api_impl.cc
@@ -30,6 +30,7 @@
 #include "vm/profiler.h"
 #include "vm/resolver.h"
 #include "vm/reusable_handles.h"
+#include "vm/service_isolate.h"
 #include "vm/service.h"
 #include "vm/stack_frame.h"
 #include "vm/symbols.h"
@@ -1252,7 +1253,7 @@ static char* BuildIsolateName(const char* script_uri,
     }
   }
 
-  if (Service::IsServiceIsolateName(script_uri)) {
+  if (ServiceIsolate::NameEquals(script_uri)) {
     return strdup(script_uri);
   }
 
@@ -5457,12 +5458,12 @@ DART_EXPORT Dart_Handle Dart_SetPeer(Dart_Handle object, void* peer) {
 
 DART_EXPORT bool Dart_IsServiceIsolate(Dart_Isolate isolate) {
   Isolate* iso = reinterpret_cast<Isolate*>(isolate);
-  return Service::IsServiceIsolate(iso);
+  return ServiceIsolate::IsServiceIsolate(iso);
 }
 
 
 DART_EXPORT Dart_Port Dart_ServiceWaitForLoadPort() {
-  return Service::WaitForLoadPort();
+  return ServiceIsolate::WaitForLoadPort();
 }