Revert of Update mojo sdk to rev c02a28868825edfa57ab77947b8cb15e741c5598

third_party/mojo/src/mojo/public/cpp/bindings/tests/router_unittest.cc

Index: third_party/mojo/src/mojo/public/cpp/bindings/tests/router_unittest.cc
diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/tests/router_unittest.cc b/third_party/mojo/src/mojo/public/cpp/bindings/tests/router_unittest.cc
index 7aeb414f3903e51f9b716167c2b27dabaa5dc239..def9cebfb69adf035167e259531874047aa2794f 100644
--- a/third_party/mojo/src/mojo/public/cpp/bindings/tests/router_unittest.cc
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/tests/router_unittest.cc
@@ -6,8 +6,8 @@
 #include <string.h>
 
 #include "mojo/public/cpp/bindings/lib/message_builder.h"
+#include "mojo/public/cpp/bindings/lib/message_queue.h"
 #include "mojo/public/cpp/bindings/lib/router.h"
-#include "mojo/public/cpp/bindings/tests/message_queue.h"
 #include "mojo/public/cpp/environment/environment.h"
 #include "mojo/public/cpp/system/macros.h"
 #include "mojo/public/cpp/utility/run_loop.h"
@@ -36,7 +36,7 @@
 
 class MessageAccumulator : public MessageReceiver {
  public:
-  explicit MessageAccumulator(MessageQueue* queue) : queue_(queue) {}
+  explicit MessageAccumulator(internal::MessageQueue* queue) : queue_(queue) {}
 
   bool Accept(Message* message) override {
     queue_->Push(message);
@@ -44,7 +44,7 @@
   }
 
  private:
-  MessageQueue* queue_;
+  internal::MessageQueue* queue_;
 };
 
 class ResponseGenerator : public MessageReceiverWithResponderStatus {
@@ -152,7 +152,7 @@
   Message request;
   AllocRequestMessage(1, "hello", &request);
 
-  MessageQueue message_queue;
+  internal::MessageQueue message_queue;
   router0.AcceptWithResponder(&request, new MessageAccumulator(&message_queue));
 
   PumpMessages();
@@ -192,7 +192,7 @@
   Message request;
   AllocRequestMessage(1, "hello", &request);
 
-  MessageQueue message_queue;
+  internal::MessageQueue message_queue;
   router0.AcceptWithResponder(&request, new MessageAccumulator(&message_queue));
 
   router1.WaitForIncomingMessage(MOJO_DEADLINE_INDEFINITE);
@@ -234,7 +234,7 @@
   Message request;
   AllocRequestMessage(1, "hello", &request);
 
-  MessageQueue message_queue;
+  internal::MessageQueue message_queue;
   router0.AcceptWithResponder(&request, new MessageAccumulator(&message_queue));
 
   PumpMessages();
@@ -256,7 +256,7 @@
   Message request;
   AllocRequestMessage(1, "hello", &request);
 
-  MessageQueue message_queue;
+  internal::MessageQueue message_queue;
   router0.AcceptWithResponder(&request, new MessageAccumulator(&message_queue));
   PumpMessages();
 
@@ -311,7 +311,7 @@
   Message request;
   AllocRequestMessage(1, "hello", &request);
 
-  MessageQueue message_queue;
+  internal::MessageQueue message_queue;
   router0.AcceptWithResponder(&request, new MessageAccumulator(&message_queue));
   PumpMessages();
 
@@ -354,7 +354,7 @@
     Message request;
     AllocRequestMessage(1, "hello", &request);
 
-    MessageQueue message_queue;
+    internal::MessageQueue message_queue;
     router0.AcceptWithResponder(&request,
                                 new MessageAccumulator(&message_queue));