Update mojo sdk to rev c02a28868825edfa57ab77947b8cb15e741c5598

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdlib.h>
 #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"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace test {
 namespace {
 
 void AllocRequestMessage(uint32_t name, const char* text, Message* message) {
   size_t payload_size = strlen(text) + 1;  // Plus null terminator.
   internal::RequestMessageBuilder builder(name, payload_size);
   memcpy(builder.buffer()->Allocate(payload_size), text, payload_size);
   builder.Finish(message);
 }
 
 void AllocResponseMessage(uint32_t name,
                           const char* text,
                           uint64_t request_id,
                           Message* message) {
   size_t payload_size = strlen(text) + 1;  // Plus null terminator.
   internal::ResponseMessageBuilder builder(name, payload_size, request_id);
   memcpy(builder.buffer()->Allocate(payload_size), text, payload_size);
   builder.Finish(message);
 }
 
 class MessageAccumulator : public MessageReceiver {
  public:
-  explicit MessageAccumulator(internal::MessageQueue* queue) : queue_(queue) {}
+  explicit MessageAccumulator(MessageQueue* queue) : queue_(queue) {}
 
   bool Accept(Message* message) override {
     queue_->Push(message);
     return true;
   }
 
  private:
-  internal::MessageQueue* queue_;
+  MessageQueue* queue_;
 };
 
 class ResponseGenerator : public MessageReceiverWithResponderStatus {
  public:
   ResponseGenerator() {}
 
   bool Accept(Message* message) override { return false; }
 
   bool AcceptWithResponder(Message* message,
                            MessageReceiverWithStatus* responder) override {
@@ skipping 87 matching lines @@
 TEST_F(RouterTest, BasicRequestResponse) {
   internal::Router router0(handle0_.Pass(), internal::FilterChain());
   internal::Router router1(handle1_.Pass(), internal::FilterChain());
 
   ResponseGenerator generator;
   router1.set_incoming_receiver(&generator);
 
   Message request;
   AllocRequestMessage(1, "hello", &request);
 
-  internal::MessageQueue message_queue;
+  MessageQueue message_queue;
   router0.AcceptWithResponder(&request, new MessageAccumulator(&message_queue));
 
   PumpMessages();
 
   EXPECT_FALSE(message_queue.IsEmpty());
 
   Message response;
   message_queue.Pop(&response);
 
   EXPECT_EQ(std::string("hello world!"),
@@ skipping 19 matching lines @@
 TEST_F(RouterTest, BasicRequestResponse_Synchronous) {
   internal::Router router0(handle0_.Pass(), internal::FilterChain());
   internal::Router router1(handle1_.Pass(), internal::FilterChain());
 
   ResponseGenerator generator;
   router1.set_incoming_receiver(&generator);
 
   Message request;
   AllocRequestMessage(1, "hello", &request);
 
-  internal::MessageQueue message_queue;
+  MessageQueue message_queue;
   router0.AcceptWithResponder(&request, new MessageAccumulator(&message_queue));
 
   router1.WaitForIncomingMessage(MOJO_DEADLINE_INDEFINITE);
   router0.WaitForIncomingMessage(MOJO_DEADLINE_INDEFINITE);
 
   EXPECT_FALSE(message_queue.IsEmpty());
 
   Message response;
   message_queue.Pop(&response);
 
@@ skipping 21 matching lines @@
 TEST_F(RouterTest, RequestWithNoReceiver) {
   internal::Router router0(handle0_.Pass(), internal::FilterChain());
   internal::Router router1(handle1_.Pass(), internal::FilterChain());
 
   // Without an incoming receiver set on router1, we expect router0 to observe
   // an error as a result of sending a message.
 
   Message request;
   AllocRequestMessage(1, "hello", &request);
 
-  internal::MessageQueue message_queue;
+  MessageQueue message_queue;
   router0.AcceptWithResponder(&request, new MessageAccumulator(&message_queue));
 
   PumpMessages();
 
   EXPECT_TRUE(router0.encountered_error());
   EXPECT_TRUE(router1.encountered_error());
   EXPECT_TRUE(message_queue.IsEmpty());
 }
 
 // Tests Router using the LazyResponseGenerator. The responses will not be
 // sent until after the requests have been accepted.
 TEST_F(RouterTest, LazyResponses) {
   internal::Router router0(handle0_.Pass(), internal::FilterChain());
   internal::Router router1(handle1_.Pass(), internal::FilterChain());
 
   LazyResponseGenerator generator;
   router1.set_incoming_receiver(&generator);
 
   Message request;
   AllocRequestMessage(1, "hello", &request);
 
-  internal::MessageQueue message_queue;
+  MessageQueue message_queue;
   router0.AcceptWithResponder(&request, new MessageAccumulator(&message_queue));
   PumpMessages();
 
   // The request has been received but the response has not been sent yet.
   EXPECT_TRUE(message_queue.IsEmpty());
 
   // Send the response.
   EXPECT_TRUE(generator.responder_is_valid());
   generator.CompleteWithResponse();
   PumpMessages();
@@ skipping 34 matching lines @@
 TEST_F(RouterTest, MissingResponses) {
   internal::Router router0(handle0_.Pass(), internal::FilterChain());
   internal::Router router1(handle1_.Pass(), internal::FilterChain());
 
   LazyResponseGenerator generator;
   router1.set_incoming_receiver(&generator);
 
   Message request;
   AllocRequestMessage(1, "hello", &request);
 
-  internal::MessageQueue message_queue;
+  MessageQueue message_queue;
   router0.AcceptWithResponder(&request, new MessageAccumulator(&message_queue));
   PumpMessages();
 
   // The request has been received but no response has been sent.
   EXPECT_TRUE(message_queue.IsEmpty());
 
   // Destroy the responder MessagerReceiver but don't send any response.
   // This should close the pipe.
   generator.CompleteWithoutResponse();
   PumpMessages();
@@ skipping 22 matching lines @@
   LazyResponseGenerator generator;
   {
     internal::Router router0(handle0_.Pass(), internal::FilterChain());
     internal::Router router1(handle1_.Pass(), internal::FilterChain());
 
     router1.set_incoming_receiver(&generator);
 
     Message request;
     AllocRequestMessage(1, "hello", &request);
 
-    internal::MessageQueue message_queue;
+    MessageQueue message_queue;
     router0.AcceptWithResponder(&request,
                                 new MessageAccumulator(&message_queue));
 
     PumpMessages();
 
     EXPECT_TRUE(generator.has_responder());
   }
 
   EXPECT_FALSE(generator.responder_is_valid());
   generator.CompleteWithResponse();  // This should end up doing nothing.
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace mojo