Roll Dart forward and use the shared vmservice isolate sources + benchmark fixes

mojo/dart/embedder/vmservice.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/dart/embedder/vmservice.h"
 
 #include "base/logging.h"
 #include "dart/runtime/include/dart_api.h"
 #include "mojo/dart/embedder/builtin.h"
 #include "mojo/dart/embedder/common.h"
 #include "mojo/dart/embedder/dart_controller.h"
 
 namespace mojo {
 namespace dart {
 
 #define RETURN_ERROR_HANDLE(handle)                             \
   if (Dart_IsError(handle)) {                                   \
     return handle;                                              \
   }
 
 #define SHUTDOWN_ON_ERROR(handle)                               \
   if (Dart_IsError(handle)) {                                   \
     error_msg_ = strdup(Dart_GetError(handle));                 \
     Dart_ExitScope();                                           \
     Dart_ShutdownIsolate();                                     \
     return false;                                               \
   }
 
 #define kLibrarySourceNamePrefix "/vmservice"
-static const char* kVMServiceIOLibraryScriptResourceName = "main.dart";
+static const char* kVMServiceIOLibraryScriptResourceName = "vmservice_io.dart";
 
 struct ResourcesEntry {
   const char* path_;
   const char* resource_;
   int length_;
 };
 
 extern ResourcesEntry __dart_embedder_service_isolate_resources_[];
 
 class Resources {
@@ skipping 78 matching lines @@
 }
 
 struct VmServiceIONativeEntry {
   const char* name;
   int num_arguments;
   Dart_NativeFunction function;
 };
 
 
 static VmServiceIONativeEntry _VmServiceIONativeEntries[] = {
-  {"ServiceIsolate_TriggerResourceLoad", 0, ServiceIsolate_TriggerResourceLoad},
-  {"ServiceIsolate_NotifyServerState", 2, ServiceIsolate_NotifyServerState},
-  {"ServiceIsolate_Shutdown", 0, ServiceIsolate_Shutdown },
+  {"VMServiceIO_NotifyServerState", 2, ServiceIsolate_NotifyServerState},
+  {"VMServiceIO_Shutdown", 0, ServiceIsolate_Shutdown },
 };
 
 
 static Dart_NativeFunction VmServiceIONativeResolver(Dart_Handle name,
                                                      int num_arguments,
                                                      bool* auto_setup_scope) {
   const char* function_name = NULL;
   Dart_Handle result = Dart_StringToCString(name, &function_name);
   DCHECK(!Dart_IsError(result));
   DCHECK(function_name != NULL);
@@ skipping 191 matching lines @@
   Dart_Handle source = GetSource(url_string);
   if (Dart_IsError(source)) {
     return source;
   }
   return Dart_LoadSource(library, url, source, 0, 0);
 }
 
 
 }  // namespace dart
 }  // namespace mojo