Add MessageChanneFactory interface and use it in ChannelDispatcherBase.

remoting/protocol/client_video_dispatcher_unittest.cc

 // 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.
 
 #include "remoting/protocol/client_video_dispatcher.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "remoting/base/buffered_socket_writer.h"
 #include "remoting/base/constants.h"
 #include "remoting/proto/video.pb.h"
 #include "remoting/protocol/fake_stream_socket.h"
 #include "remoting/protocol/message_reader.h"
 #include "remoting/protocol/message_serialization.h"
+#include "remoting/protocol/stream_message_pipe_adapter.h"
 #include "remoting/protocol/video_stub.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace remoting {
 namespace protocol {
 
 class ClientVideoDispatcherTest : public testing::Test,
                                   public VideoStub,
                                   public ChannelDispatcherBase::EventHandler {
  public:
   ClientVideoDispatcherTest();
 
   // VideoStub interface.
   void ProcessVideoPacket(scoped_ptr<VideoPacket> video_packet,
                           const base::Closure& done) override;
 
   // ChannelDispatcherBase::EventHandler interface.
   void OnChannelInitialized(ChannelDispatcherBase* channel_dispatcher) override;
-  void OnChannelError(ChannelDispatcherBase* channel_dispatcher,
-                      ErrorCode error) override;
 
  protected:
+  void OnChannelError(int error);
+
   void OnMessageReceived(scoped_ptr<CompoundBuffer> buffer);
   void OnReadError(int error);
 
   base::MessageLoop message_loop_;
 
   // Set to true in OnChannelInitialized().
-  bool initialized_;
+  bool initialized_ = false;
 
   // Client side.
   FakeStreamChannelFactory client_channel_factory_;
+  StreamMessageChannelFactoryAdapter channel_factory_adapter_;
   ClientVideoDispatcher dispatcher_;
 
   // Host side.
   FakeStreamSocket host_socket_;
   MessageReader reader_;
   BufferedSocketWriter writer_;
 
   ScopedVector<VideoPacket> video_packets_;
   std::vector<base::Closure> packet_done_callbacks_;
 
   ScopedVector<VideoAck> ack_messages_;
 };
 
 ClientVideoDispatcherTest::ClientVideoDispatcherTest()
-    : initialized_(false),
+    : channel_factory_adapter_(
+          &client_channel_factory_,
+          base::Bind(&ClientVideoDispatcherTest::OnChannelError,
+                     base::Unretained(this))),
       dispatcher_(this) {
-  dispatcher_.Init(&client_channel_factory_, this);
+  dispatcher_.Init(&channel_factory_adapter_, this);
   base::RunLoop().RunUntilIdle();
   DCHECK(initialized_);
   host_socket_.PairWith(
       client_channel_factory_.GetFakeChannel(kVideoChannelName));
   reader_.StartReading(&host_socket_,
                        base::Bind(&ClientVideoDispatcherTest::OnMessageReceived,
                                   base::Unretained(this)),
                        base::Bind(&ClientVideoDispatcherTest::OnReadError,
                                   base::Unretained(this)));
   writer_.Start(
       base::Bind(&P2PStreamSocket::Write, base::Unretained(&host_socket_)),
       BufferedSocketWriter::WriteFailedCallback());
 }
 
 void ClientVideoDispatcherTest::ProcessVideoPacket(
     scoped_ptr<VideoPacket> video_packet,
     const base::Closure& done) {
   video_packets_.push_back(video_packet.release());
   packet_done_callbacks_.push_back(done);
 }
 
 void ClientVideoDispatcherTest::OnChannelInitialized(
     ChannelDispatcherBase* channel_dispatcher) {
   initialized_ = true;
 }
 
-void ClientVideoDispatcherTest::OnChannelError(
-    ChannelDispatcherBase* channel_dispatcher,
-    ErrorCode error) {
+void ClientVideoDispatcherTest::OnChannelError(int error) {
   // Don't expect channel creation to fail.
   FAIL();
 }
 
 void ClientVideoDispatcherTest::OnMessageReceived(
     scoped_ptr<CompoundBuffer> buffer) {
   scoped_ptr<VideoAck> ack = ParseMessage<VideoAck>(buffer.get());
   EXPECT_TRUE(ack);
   ack_messages_.push_back(ack.release());
 }
@@ skipping 72 matching lines @@
   base::RunLoop().RunUntilIdle();
 
   // Verify order of Ack messages.
   ASSERT_EQ(2U, ack_messages_.size());
   EXPECT_EQ(kTestFrameId, ack_messages_[0]->frame_id());
   EXPECT_EQ(kTestFrameId + 1, ack_messages_[1]->frame_id());
 }
 
 }  // namespace protocol
 }  // namespace remoting