Revert of Update Dart dependency and patch dart_controller to account for

sky/engine/core/script/dart_controller.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 "sky/engine/config.h"
 #include "sky/engine/core/script/dart_controller.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 220 matching lines @@
   CHECK(!LogIfError(Dart_RunLoop()));
   handle_watcher_started = true;
 }
 
 // TODO(rafaelw): Right now this only supports the creation of the handle
 // watcher isolate and the service isolate. Presumably, we'll want application
 // isolates to spawn their own isolates.
 static Dart_Isolate IsolateCreateCallback(const char* script_uri,
                                           const char* main,
                                           const char* package_root,
-                                          Dart_IsolateFlags* flags,
                                           void* callback_data,
                                           char** error) {
 
   if (IsServiceIsolateURL(script_uri)) {
     CHECK(kDartIsolateSnapshotBuffer);
     DartState* dart_state = new DartState();
     Dart_Isolate isolate = Dart_CreateIsolate(script_uri,
                                               "main",
                                               kDartIsolateSnapshotBuffer,
                                               nullptr,
-                                              nullptr,
                                               error);
     CHECK(isolate) << error;
     dart_state->SetIsolate(isolate);
     CHECK(Dart_IsServiceIsolate(isolate));
     CHECK(!LogIfError(Dart_SetLibraryTagHandler(LibraryTagHandler)));
     {
       DartApiScope apiScope;
       Builtin::SetNativeResolver(Builtin::kBuiltinLibrary);
       Builtin::SetNativeResolver(Builtin::kMojoInternalLibrary);
       Builtin::SetNativeResolver(Builtin::kIOLibrary);
@@ skipping 10 matching lines @@
       }
     }
     Dart_ExitIsolate();
     return isolate;
   }
 
   // Create & start the handle watcher isolate
   CHECK(kDartIsolateSnapshotBuffer);
   DartState* dart_state = new DartState();
   Dart_Isolate isolate = Dart_CreateIsolate("sky:handle_watcher", "",
-      kDartIsolateSnapshotBuffer, nullptr, dart_state, error);
+      kDartIsolateSnapshotBuffer, dart_state, error);
   CHECK(isolate) << error;
   dart_state->SetIsolate(isolate);
 
   CHECK(!LogIfError(Dart_SetLibraryTagHandler(LibraryTagHandler)));
 
   {
     DartApiScope apiScope;
     Builtin::SetNativeResolver(Builtin::kBuiltinLibrary);
     Builtin::SetNativeResolver(Builtin::kMojoInternalLibrary);
     Builtin::SetNativeResolver(Builtin::kIOLibrary);
@@ skipping 25 matching lines @@
   Platform::current()->mainThreadTaskRunner()->PostTask(FROM_HERE,
       base::Bind(&CallHandleMessage, DartState::From(dest_isolate)->GetWeakPtr()));
 }
 
 void DartController::CreateIsolateFor(PassOwnPtr<DOMDartState> state) {
   CHECK(kDartIsolateSnapshotBuffer);
   char* error = nullptr;
   dom_dart_state_ = state;
   Dart_Isolate isolate = Dart_CreateIsolate(
       dom_dart_state_->url().string().utf8().data(), "main",
-      kDartIsolateSnapshotBuffer, nullptr,
+      kDartIsolateSnapshotBuffer,
       static_cast<DartState*>(dom_dart_state_.get()), &error);
   Dart_SetMessageNotifyCallback(MessageNotifyCallback);
   CHECK(isolate) << error;
   dom_dart_state_->SetIsolate(isolate);
   Dart_SetGcCallbacks(DartGCPrologue, DartGCEpilogue);
   CHECK(!LogIfError(Dart_SetLibraryTagHandler(LibraryTagHandler)));
 
   {
     DartApiScope apiScope;
 
@@ skipping 51 matching lines @@
                         nullptr,  // Isolate interrupt callback.
                         UnhandledExceptionCallback, IsolateShutdownCallback,
                         // File IO callbacks.
                         nullptr, nullptr, nullptr, nullptr, nullptr));
   // Wait for load port- ensures handle watcher and service isolates are
   // running.
   Dart_ServiceWaitForLoadPort();
 }
 
 } // namespace blink