Merge the Sky Engine changes from the SkyDart branch

sky/engine/bindings2/mojo_natives.cc

 // Copyright 2014 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 "sky/engine/config.h"
+#include "sky/engine/bindings2/mojo_natives.h"
+
 #include <stdio.h>
 #include <string.h>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
-#include "builtin.h"
 #include "dart/runtime/include/dart_api.h"
 #include "mojo/public/c/system/core.h"
 #include "mojo/public/cpp/system/core.h"
+#include "sky/engine/bindings2/builtin.h"
+#include "sky/engine/tonic/dart_converter.h"
+#include "sky/engine/tonic/dart_builtin.h"
 
 namespace blink {
 
 #define REGISTER_FUNCTION(name, count)                                         \
   { "" #name, name, count },
 #define DECLARE_FUNCTION(name, count)                                          \
   extern void name(Dart_NativeArguments args);
 
 #define MOJO_NATIVE_LIST(V)                \
   V(MojoSharedBuffer_Create, 2)            \
@@ skipping 61 matching lines @@
 static void SetNullReturn(Dart_NativeArguments arguments) {
   Dart_SetReturnValue(arguments, Dart_Null());
 }
 
 static void SetInvalidArgumentReturn(Dart_NativeArguments arguments) {
   Dart_SetIntegerReturnValue(
       arguments, static_cast<int64_t>(MOJO_RESULT_INVALID_ARGUMENT));
 }
 
 static Dart_Handle MojoLib() {
-  return DartBuiltins::LookupLibrary("dart:mojo_core");
+  return DartBuiltin::LookupLibrary("dart:mojo_core");
 }
 
 static Dart_Handle SignalsStateToDart(Dart_Handle klass,
                                       const MojoHandleSignalsState& state) {
   Dart_Handle arg1 = Dart_NewInteger(state.satisfied_signals);
   Dart_Handle arg2 = Dart_NewInteger(state.satisfiable_signals);
   Dart_Handle args[] = {arg1, arg2};
   return Dart_New(klass, Dart_Null(), 2, args);
 }
 
@@ skipping 687 matching lines @@
   CHECK_INTEGER_ARGUMENT(arguments, 0, &control_handle, InvalidArgument);
   mojo_control_handle = control_handle;
   Dart_SetIntegerReturnValue(arguments, static_cast<int64_t>(MOJO_RESULT_OK));
 }
 
 void MojoHandleWatcher_GetControlHandle(Dart_NativeArguments arguments) {
   Dart_SetIntegerReturnValue(arguments, mojo_control_handle);
 }
 
 }  // namespace blink