Remove DebuggerEvent. Refactor remaining code.

runtime/vm/debugger_test.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/dart_api_impl.h"
 #include "vm/debugger.h"
 #include "vm/unit_test.h"
 
 namespace dart {
 
@@ skipping 28 matching lines @@
       "  return x.toString();\n"
       "}\n";
   Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
   EXPECT_VALID(lib);
   Library& vmlib = Library::Handle();
   vmlib ^= Api::UnwrapHandle(lib);
   EXPECT(!vmlib.IsNull());
 
   Isolate* isolate = Isolate::Current();
   Debugger* debugger = isolate->debugger();
-  const String& url = String::Handle(String::New(TestCase::url()));
 
   // Empty case.
   {
     JSONStream js;
     {
       JSONArray jsarr(&js);
       debugger->PrintBreakpointsToJSONArray(&jsarr);
     }
     EXPECT_STREQ("[]", js.ToCString());
   }
 
   // Test with a couple of breakpoints.
-  debugger->SetBreakpointAtLine(url, 2);
-  debugger->SetBreakpointAtLine(url, 3);
+  Dart_Handle url = NewString(TestCase::url());
+  EXPECT_VALID(Dart_SetBreakpoint(url, 2));
+  EXPECT_VALID(Dart_SetBreakpoint(url, 3));
   {
     JSONStream js;
     {
       JSONArray jsarr(&js);
       debugger->PrintBreakpointsToJSONArray(&jsarr);
     }
     ExpectSubstringF(
         js.ToCString(),
         "[{\"type\":\"Breakpoint\",\"fixedId\":true,\"id\":\"breakpoints\\/2\","
         "\"breakpointNumber\":2,\"resolved\":false,"
@@ skipping 17 matching lines @@
 static bool saw_paused_event = false;
 
 static void InspectPausedEvent(Dart_IsolateId isolate_id,
                                intptr_t bp_id,
                                const Dart_CodeLocation& loc) {
   Isolate* isolate = Isolate::Current();
   Debugger* debugger = isolate->debugger();
 
   // The debugger knows that it is paused, and why.
   EXPECT(debugger->IsPaused());
-  const DebuggerEvent* event = debugger->PauseEvent();
+  const ServiceEvent* event = debugger->PauseEvent();
   EXPECT(event != NULL);
-  EXPECT(event->type() == DebuggerEvent::kBreakpointReached);
+  EXPECT(event->kind() == ServiceEvent::kPauseBreakpoint);
   saw_paused_event = true;
 }
 
 
 TEST_CASE(Debugger_PauseEvent) {
   const char* kScriptChars =
       "main() {\n"
       "  var x = new StringBuffer();\n"
       "  x.write('won');\n"
       "  x.write('too');\n"
       "  return x.toString();\n"
       "}\n";
   Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
   EXPECT_VALID(lib);
 
   Isolate* isolate = Isolate::Current();
   Debugger* debugger = isolate->debugger();
-  const String& url = String::Handle(String::New(TestCase::url()));
 
   // No pause event.
   EXPECT(!debugger->IsPaused());
   EXPECT(debugger->PauseEvent() == NULL);
 
   saw_paused_event = false;
   Dart_SetPausedEventHandler(InspectPausedEvent);
 
   // Set a breakpoint and run.
-  debugger->SetBreakpointAtLine(url, 2);
+  EXPECT_VALID(Dart_SetBreakpoint(NewString(TestCase::url()), 2));
   Dart_Handle result = Dart_Invoke(lib, NewString("main"), 0, NULL);
   EXPECT_VALID(result);
   EXPECT(Dart_IsString(result));
 
   // We ran the code in InspectPausedEvent.
   EXPECT(saw_paused_event);
 }
 
 #endif  // !PRODUCT
 
 }  // namespace dart