Fold ApiObjectConverter use into ApiMessageReader

runtime/vm/native_message_handler.cc

Index: runtime/vm/native_message_handler.cc
diff --git a/runtime/vm/native_message_handler.cc b/runtime/vm/native_message_handler.cc
index e99caa5debe3ee22d3b456bdebf6d2571faf359e..7779e95c5f369bfac872a4056d0cbb63a67ce29c 100644
--- a/runtime/vm/native_message_handler.cc
+++ b/runtime/vm/native_message_handler.cc
@@ -42,22 +42,10 @@ MessageHandler::MessageStatus NativeMessageHandler::HandleMessage(
   // All allocation of objects for decoding the message is done in the
   // zone associated with this scope.
   ApiNativeScope scope;
-
-  if (message->IsRaw()) {
-    // TODO(zra): This should be folded into ApiMessageReader. This will likely
-    // require ApiMessageReader to have a constructor that takes a Message*.
-    ASSERT(ApiObjectConverter::CanConvert(message->raw_obj()));
-    Dart_CObject object;
-    bool success = ApiObjectConverter::Convert(message->raw_obj(), &object);
-    ASSERT(success);
-    (*func())(message->dest_port(), &object);
-  } else {
-    Dart_CObject* object;
-    ApiMessageReader reader(message->data(), message->len());
-    object = reader.ReadMessage();
-    (*func())(message->dest_port(), object);
-  }
-
+  Dart_CObject* object;
+  ApiMessageReader reader(message);
+  object = reader.ReadMessage();
+  (*func())(message->dest_port(), object);
   delete message;
   return kOK;
 }