VM restart + shutdown fixes

runtime/vm/message_handler_test.cc

Index: runtime/vm/message_handler_test.cc
diff --git a/runtime/vm/message_handler_test.cc b/runtime/vm/message_handler_test.cc
index 7bfcb9aa557d851cfc658a40d22ac262e16ceb32..65b1860a0032ba216c30e268df00c42240a12d1e 100644
--- a/runtime/vm/message_handler_test.cc
+++ b/runtime/vm/message_handler_test.cc
@@ -39,7 +39,7 @@ class TestMessageHandler : public MessageHandler {
         message_count_(0),
         start_called_(false),
         end_called_(false),
-        result_(true) {
+        result_(kOK) {
   }
 
   ~TestMessageHandler() {
@@ -50,7 +50,7 @@ class TestMessageHandler : public MessageHandler {
     notify_count_++;
   }
 
-  bool HandleMessage(Message* message) {
+  MessageStatus HandleMessage(Message* message) {
     // For testing purposes, keep a list of the ports
     // for all messages we receive.
     AddPortToBuffer(message->dest_port());
@@ -59,9 +59,9 @@ class TestMessageHandler : public MessageHandler {
     return result_;
   }
 
-  bool Start() {
+  MessageStatus Start() {
     start_called_ = true;
-    return true;
+    return kOK;
   }
 
   void End() {
@@ -75,7 +75,7 @@ class TestMessageHandler : public MessageHandler {
   bool start_called() const { return start_called_; }
   bool end_called() const { return end_called_; }
 
-  void set_result(bool result) { result_ = result; }
+  void set_result(MessageStatus result) { result_ = result; }
 
  private:
   void AddPortToBuffer(Dart_Port port) {
@@ -101,13 +101,13 @@ class TestMessageHandler : public MessageHandler {
   int message_count_;
   bool start_called_;
   bool end_called_;
-  bool result_;
+  MessageStatus result_;
 
   DISALLOW_COPY_AND_ASSIGN(TestMessageHandler);
 };
 
 
-bool TestStartFunction(uword data) {
+MessageHandler::MessageStatus TestStartFunction(uword data) {
   return (reinterpret_cast<TestMessageHandler*>(data))->Start();
 }
 
@@ -232,7 +232,7 @@ UNIT_TEST_CASE(MessageHandler_HandleNextMessage) {
   handler_peer.PostMessage(oob_message2);
 
   // We handle both oob messages and a single normal message.
-  EXPECT(handler.HandleNextMessage());
+  EXPECT_EQ(MessageHandler::kOK, handler.HandleNextMessage());
   EXPECT_EQ(3, handler.message_count());
   Dart_Port* ports = handler.port_buffer();
   EXPECT_EQ(port2, ports[0]);
@@ -259,7 +259,7 @@ UNIT_TEST_CASE(MessageHandler_HandleOOBMessages) {
   handler_peer.PostMessage(oob_message2);
 
   // We handle both oob messages but no normal messages.
-  EXPECT(handler.HandleOOBMessages());
+  EXPECT_EQ(MessageHandler::kOK, handler.HandleOOBMessages());
   EXPECT_EQ(2, handler.message_count());
   Dart_Port* ports = handler.port_buffer();
   EXPECT_EQ(port3, ports[0]);