Add Observatory to sky dart_controller

sky/engine/core/script/dart_debugger.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 <vector>
 
 #include "dart/runtime/include/dart_api.h"
 #include "dart/runtime/include/dart_debugger_api.h"
 #include "dart/runtime/include/dart_native_api.h"
-#include "mojo/dart/embedder/dart_debugger.h"
+#include "dart_debugger.h"
 
-namespace mojo {
-namespace dart {
+namespace blink {
 
 void DartDebuggerIsolate::MessageLoop() {
   MonitorLocker ml(&monitor_);
   // Request notification on isolate messages.  This allows us to
   // respond to vm service messages while at breakpoint.
   Dart_SetMessageNotifyCallback(DartDebugger::NotifyIsolate);
   while (true) {
     // Handle all available vm service messages, up to a resume
     // request.
     bool resume = false;
@@ skipping 67 matching lines @@
     debugger_isolate->Notify();
   }
 }
 
 void DartDebugger::InitDebugger() {
   Dart_SetIsolateEventHandler(IsolateEventHandler);
   Dart_SetPausedEventHandler(PausedEventHandler);
   Dart_SetBreakpointResolvedHandler(BptResolvedHandler);
   Dart_SetExceptionThrownHandler(ExceptionThrownHandler);
   lock_ = new base::Lock();
+  isolates_ = new std::vector<DartDebuggerIsolate*>();
 }
 
 DartDebuggerIsolate* DartDebugger::FindIsolateById(Dart_IsolateId id) {
   base::AutoLock al(*lock_);
   return FindIsolateByIdLocked(id);
 }
 
 DartDebuggerIsolate* DartDebugger::FindIsolateByIdLocked(
       Dart_IsolateId id) {
   lock_->AssertAcquired();
-  for (size_t i = 0; i < isolates_.size(); i++) {
-    DartDebuggerIsolate* isolate = isolates_[i];
+  for (size_t i = 0; i < isolates_->size(); i++) {
+    DartDebuggerIsolate* isolate = (*isolates_)[i];
     if (id == isolate->id()) {
       return isolate;
     }
   }
   return nullptr;
 }
 
 DartDebuggerIsolate* DartDebugger::AddIsolate(Dart_IsolateId id) {
   base::AutoLock al(*lock_);
   CHECK(FindIsolateByIdLocked(id) == nullptr);
   DartDebuggerIsolate* debugger_isolate =
       new DartDebuggerIsolate(id);
-  isolates_.push_back(debugger_isolate);
+  isolates_->push_back(debugger_isolate);
   return debugger_isolate;
 }
 
 void DartDebugger::RemoveIsolate(Dart_IsolateId id) {
   base::AutoLock al(*lock_);
-  for (size_t i = 0; i < isolates_.size(); i++) {
-    DartDebuggerIsolate* isolate = isolates_[i];
+  for (size_t i = 0; i < isolates_->size(); i++) {
+    DartDebuggerIsolate* isolate = (*isolates_)[i];
     if (id == isolate->id()) {
-      isolates_.erase(isolates_.begin() + i);
+      isolates_->erase(isolates_->begin() + i);
+      delete isolate;
       return;
     }
   }
   NOTREACHED();
 }
 
 base::Lock* DartDebugger::lock_ = nullptr;
-std::vector<DartDebuggerIsolate*> DartDebugger::isolates_;
+std::vector<DartDebuggerIsolate*>* DartDebugger::isolates_ = nullptr;
 
-}  // namespace apps
-}  // namespace mojo
+}  // namespace blink