Make TestChannelEndpointClient use MessageInTransitQueue.

mojo/edk/system/test_channel_endpoint_client.h

 // Copyright 2015 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.
 
 #ifndef MOJO_EDK_SYSTEM_TEST_CHANNEL_ENDPOINT_CLIENT_H_
 #define MOJO_EDK_SYSTEM_TEST_CHANNEL_ENDPOINT_CLIENT_H_
 
-#include <deque>
-
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "mojo/edk/system/channel_endpoint.h"
 #include "mojo/edk/system/channel_endpoint_client.h"
+#include "mojo/edk/system/message_in_transit_queue.h"
 
 namespace base {
 class WaitableEvent;
 }
 
 namespace mojo {
 namespace system {
-
-class MessageInTransit;
-
 namespace test {
 
 class TestChannelEndpointClient : public ChannelEndpointClient {
  public:
   TestChannelEndpointClient();
 
   // Initializes with the given port and endpoint.
   void Init(unsigned port, ChannelEndpoint* endpoint);
 
   // Returns true if we're detached from the |ChannelEndpoint|.
@@ skipping 15 matching lines @@
   void OnDetachFromChannel(unsigned port) override;
 
  private:
   ~TestChannelEndpointClient() override;
 
   mutable base::Lock lock_;  // Protects the members below.
 
   unsigned port_;
   scoped_refptr<ChannelEndpoint> endpoint_;
 
-  // Owns the messages. TODO(vtl): Change them to scoped_ptr/unique_ptr when we
-  // can.
-  std::deque<MessageInTransit*> messages_;
+  MessageInTransitQueue messages_;
 
   // Event to trigger if we read a message (may be null).
   base::WaitableEvent* read_event_;
 
   DISALLOW_COPY_AND_ASSIGN(TestChannelEndpointClient);
 };
 
 }  // namespace test
 }  // namespace system
 }  // namespace mojo
 
 #endif  // MOJO_EDK_SYSTEM_TEST_CHANNEL_ENDPOINT_CLIENT_H_