Remove DebuggerEvent. Refactor remaining code.

runtime/vm/service_event.h

Index: runtime/vm/service_event.h
diff --git a/runtime/vm/service_event.h b/runtime/vm/service_event.h
index 3ca26e40a97c12f41b7b27c615178d0643afccd6..cc066761b79a981921bcfdc70725591e4a428c47 100644
--- a/runtime/vm/service_event.h
+++ b/runtime/vm/service_event.h
@@ -5,13 +5,20 @@
 #ifndef VM_SERVICE_EVENT_H_
 #define VM_SERVICE_EVENT_H_
 
-#include "vm/debugger.h"
-
-class DebuggerEvent;
-class TimelineEventBlock;
+#include "vm/globals.h"
+#include "vm/heap.h"
 
 namespace dart {
 
+class ActivationFrame;
+class Breakpoint;
+class Instance;
+class Isolate;
+class Object;
+class StreamInfo;
+class String;
+class TimelineEventBlock;
+
 class ServiceEvent {
  public:
   enum EventKind {
@@ -68,10 +75,13 @@ class ServiceEvent {
 
   ServiceEvent(Isolate* isolate, EventKind event_kind);
 
-  explicit ServiceEvent(const DebuggerEvent* debugger_event);
-
   Isolate* isolate() const { return isolate_; }
 
+  // Used by the C embedding api.
+  Dart_Port isolate_id() const {
+    return isolate_->main_port();
+  }
+
   EventKind kind() const { return kind_; }
 
   bool IsPause() const {
@@ -95,6 +105,7 @@ class ServiceEvent {
     embedder_kind_ = embedder_kind;
   }
 
+  const StreamInfo* stream_info() const;
   const char* stream_id() const;
 
   void set_embedder_stream_id(const char* stream_id) {
@@ -182,6 +193,8 @@ class ServiceEvent {
     extension_event_ = extension_event;
   }
 
+  void UpdateTimestamp();
+
   int64_t timestamp() const {
     return timestamp_;
   }