Fix shutdown crash in Sky

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 228 matching lines @@
 
   if (IsServiceIsolateURL(script_uri)) {
     CHECK(kDartIsolateSnapshotBuffer);
     DartState* dart_state = new DartState();
     Dart_Isolate isolate = Dart_CreateIsolate(script_uri,
                                               "main",
                                               kDartIsolateSnapshotBuffer,
                                               nullptr,
                                               error);
     CHECK(isolate) << error;
-    dart_state->set_isolate(isolate);
+    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);
       BuiltinNatives::Init(BuiltinNatives::DartIOIsolate);
       // Start the handle watcher from the service isolate so it isn't available
       // for debugging or general Observatory interaction.
       EnsureHandleWatcherStarted();
       if (RuntimeEnabledFeatures::observatoryEnabled()) {
         std::string ip = "127.0.0.1";
         const intptr_t port = 8181;
         const bool service_isolate_booted =
             DartServiceIsolate::Startup(ip, port, LibraryTagHandler, error);
         CHECK(service_isolate_booted) << error;
       }
     }
     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, dart_state, error);
   CHECK(isolate) << error;
-  dart_state->set_isolate(isolate);
+  dart_state->SetIsolate(isolate);
 
   CHECK(!LogIfError(Dart_SetLibraryTagHandler(LibraryTagHandler)));
 
   {
     DartApiScope apiScope;
     Builtin::SetNativeResolver(Builtin::kBuiltinLibrary);
     Builtin::SetNativeResolver(Builtin::kMojoInternalLibrary);
     Builtin::SetNativeResolver(Builtin::kIOLibrary);
 
     // Ensure the isolate has a root library.
@@ skipping 27 matching lines @@
 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,
       static_cast<DartState*>(dom_dart_state_.get()), &error);
   Dart_SetMessageNotifyCallback(MessageNotifyCallback);
   CHECK(isolate) << error;
-  dom_dart_state_->set_isolate(isolate);
+  dom_dart_state_->SetIsolate(isolate);
   Dart_SetGcCallbacks(DartGCPrologue, DartGCEpilogue);
   CHECK(!LogIfError(Dart_SetLibraryTagHandler(LibraryTagHandler)));
 
   {
     DartApiScope apiScope;
 
     // Ensure the isolate has a root library.
     Dart_LoadScript(Dart_NewStringFromCString("dart:empty"),
                     Dart_NewStringFromCString(""), 0, 0);
 
@@ skipping 17 matching lines @@
   DartIsolateScope isolate_scope(dart_state()->isolate());
   DartApiScope dart_api_scope;
 
   builtin_sky_->InstallView(view);
 }
 
 void DartController::ClearForClose() {
   // Don't use a DartIsolateScope here since we never exit the isolate.
   Dart_EnterIsolate(dom_dart_state_->isolate());
   Dart_ShutdownIsolate();
+  dom_dart_state_->SetIsolate(nullptr);
   dom_dart_state_.clear();
 }
 
 void DartController::InitVM() {
   int argc = 0;
   const char** argv = nullptr;
 
 #if ENABLE(DART_STRICT)
   argc = arraysize(kCheckedModeArgs);
   argv = kCheckedModeArgs;
 #endif
 
   dart::bin::BootstrapDartIo();
 
   CHECK(Dart_SetVMFlags(argc, argv));
   // This should be called before calling Dart_Initialize.
   DartDebugger::InitDebugger();
   CHECK(Dart_Initialize(kDartVmIsolateSnapshotBuffer,
                         IsolateCreateCallback,
                         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