Revert my last change. Odd test failures that I will investigate tomorrow.

runtime/vm/port_test.cc

 // Copyright (c) 2012, 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 "platform/assert.h"
 #include "vm/message.h"
 #include "vm/os.h"
 #include "vm/port.h"
 #include "vm/unit_test.h"
 
@@ skipping 136 matching lines @@
 }
 
 
 intptr_t GetIntData(uint8_t* data) {
   return *reinterpret_cast<intptr_t*>(data);
 }
 
 
 static Message* NextMessage() {
   Isolate* isolate = Isolate::Current();
-  Message* result = isolate->message_handler()->Dequeue(0);
+  Message* result = isolate->message_handler()->queue()->Dequeue(0);
   return result;
 }
 
 
 void ThreadedPort_start(uword parameter) {
   // TODO(turnidge): We only use the isolate to get access to its
   // message handler.  I should rewrite this test to use a
   // TestMessageHandler instead.
   Isolate* isolate = Dart::CreateIsolate(NULL);
 
@@ skipping 55 matching lines @@
   // Give the spawned thread enough time to properly exit.
   Monitor* waiter = new Monitor();
   {
     MonitorLocker ml(waiter);
     ml.Wait(20);
   }
   delete waiter;
 }
 
 }  // namespace dart