Add MessageChanneFactory interface and use it in ChannelDispatcherBase.

remoting/protocol/ice_transport_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/ice_transport.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "jingle/glue/thread_wrapper.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "remoting/protocol/chromium_port_allocator.h"
 #include "remoting/protocol/connection_tester.h"
 #include "remoting/protocol/fake_authenticator.h"
-#include "remoting/protocol/p2p_stream_socket.h"
-#include "remoting/protocol/stream_channel_factory.h"
+#include "remoting/protocol/message_channel_factory.h"
+#include "remoting/protocol/message_pipe.h"
 #include "remoting/protocol/transport_context.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
 
 using testing::_;
 
 namespace remoting {
 namespace protocol {
 
@@ skipping 11 matching lines @@
 
 ACTION_P2(QuitRunLoopOnCounter, run_loop, counter) {
   --(*counter);
   EXPECT_GE(*counter, 0);
   if (*counter == 0)
     run_loop->Quit();
 }
 
 class MockChannelCreatedCallback {
  public:
-  MOCK_METHOD1(OnDone, void(P2PStreamSocket* socket));
+  MOCK_METHOD1(OnDone, void(MessagePipe* socket));
 };
 
 class TestTransportEventHandler : public IceTransport::EventHandler {
  public:
   typedef base::Callback<void(ErrorCode error)> ErrorCallback;
 
   TestTransportEventHandler() {}
   ~TestTransportEventHandler() {}
 
   void set_error_callback(const ErrorCallback& callback) {
@@ skipping 17 matching lines @@
 
 class IceTransportTest : public testing::Test {
  public:
   IceTransportTest() {
     jingle_glue::JingleThreadWrapper::EnsureForCurrentMessageLoop();
     network_settings_ =
         NetworkSettings(NetworkSettings::NAT_TRAVERSAL_OUTGOING);
   }
 
   void TearDown() override {
-    client_socket_.reset();
-    host_socket_.reset();
+    client_message_pipe_.reset();
+    host_message_pipe_.reset();
     client_transport_.reset();
     host_transport_.reset();
     message_loop_.RunUntilIdle();
   }
 
   void ProcessTransportInfo(scoped_ptr<IceTransport>* target_transport,
                             scoped_ptr<buzz::XmlElement> transport_info) {
     base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
         FROM_HERE, base::Bind(&IceTransportTest::DeliverTransportInfo,
                               base::Unretained(this), target_transport,
@@ skipping 45 matching lines @@
     run_loop_.reset(new base::RunLoop());
 
     int counter = 2;
     EXPECT_CALL(client_channel_callback_, OnDone(_))
         .WillOnce(QuitRunLoopOnCounter(run_loop_.get(), &counter));
     EXPECT_CALL(host_channel_callback_, OnDone(_))
         .WillOnce(QuitRunLoopOnCounter(run_loop_.get(), &counter));
 
     run_loop_->Run();
 
-    EXPECT_TRUE(client_socket_.get());
-    EXPECT_TRUE(host_socket_.get());
+    EXPECT_TRUE(client_message_pipe_.get());
+    EXPECT_TRUE(host_message_pipe_.get());
   }
 
-  void OnClientChannelCreated(scoped_ptr<P2PStreamSocket> socket) {
-    client_socket_ = std::move(socket);
-    client_channel_callback_.OnDone(client_socket_.get());
+  void OnClientChannelCreated(scoped_ptr<MessagePipe> message_pipe) {
+    client_message_pipe_ = std::move(message_pipe);
+    client_channel_callback_.OnDone(client_message_pipe_.get());
   }
 
-  void OnHostChannelCreated(scoped_ptr<P2PStreamSocket> socket) {
-    host_socket_ = std::move(socket);
-    host_channel_callback_.OnDone(host_socket_.get());
+  void OnHostChannelCreated(scoped_ptr<MessagePipe> message_pipe) {
+    host_message_pipe_ = std::move(message_pipe);
+    host_channel_callback_.OnDone(host_message_pipe_.get());
   }
 
   void OnTransportError(ErrorCode error) {
+    LOG(ERROR) << "Transport Error";
     error_ = error;
     run_loop_->Quit();
   }
 
  protected:
   base::MessageLoopForIO message_loop_;
   scoped_ptr<base::RunLoop> run_loop_;
 
   NetworkSettings network_settings_;
 
   base::TimeDelta transport_info_delay_;
 
   scoped_ptr<IceTransport> host_transport_;
   TestTransportEventHandler host_event_handler_;
   scoped_ptr<FakeAuthenticator> host_authenticator_;
 
   scoped_ptr<IceTransport> client_transport_;
   TestTransportEventHandler client_event_handler_;
   scoped_ptr<FakeAuthenticator> client_authenticator_;
 
   MockChannelCreatedCallback client_channel_callback_;
   MockChannelCreatedCallback host_channel_callback_;
 
-  scoped_ptr<P2PStreamSocket> client_socket_;
-  scoped_ptr<P2PStreamSocket> host_socket_;
+  scoped_ptr<MessagePipe> client_message_pipe_;
+  scoped_ptr<MessagePipe> host_message_pipe_;
 
   ErrorCode error_ = OK;
 };
 
 TEST_F(IceTransportTest, DataStream) {
   InitializeConnection();
 
-  client_transport_->GetStreamChannelFactory()->CreateChannel(
+  client_transport_->GetChannelFactory()->CreateChannel(
       kChannelName, base::Bind(&IceTransportTest::OnClientChannelCreated,
                                base::Unretained(this)));
-  host_transport_->GetStreamChannelFactory()->CreateChannel(
+  host_transport_->GetChannelFactory()->CreateChannel(
       kChannelName, base::Bind(&IceTransportTest::OnHostChannelCreated,
                                base::Unretained(this)));
 
   WaitUntilConnected();
 
-  StreamConnectionTester tester(host_socket_.get(), client_socket_.get(),
-                                kMessageSize, kMessages);
-  tester.Start();
-  message_loop_.Run();
-  tester.CheckResults();
+  MessagePipeConnectionTester tester(host_message_pipe_.get(),
+                                     client_message_pipe_.get(), kMessageSize,
+                                     kMessages);
+  tester.RunAndCheckResults();
 }
 
 TEST_F(IceTransportTest, MuxDataStream) {
   InitializeConnection();
 
   client_transport_->GetMultiplexedChannelFactory()->CreateChannel(
       kChannelName, base::Bind(&IceTransportTest::OnClientChannelCreated,
                                base::Unretained(this)));
   host_transport_->GetMultiplexedChannelFactory()->CreateChannel(
       kChannelName, base::Bind(&IceTransportTest::OnHostChannelCreated,
                                base::Unretained(this)));
 
   WaitUntilConnected();
 
-  StreamConnectionTester tester(host_socket_.get(), client_socket_.get(),
-                                kMessageSize, kMessages);
-  tester.Start();
-  message_loop_.Run();
-  tester.CheckResults();
+  MessagePipeConnectionTester tester(host_message_pipe_.get(),
+                                     client_message_pipe_.get(), kMessageSize,
+                                     kMessages);
+  tester.RunAndCheckResults();
 }
 
 TEST_F(IceTransportTest, FailedChannelAuth) {
   // Use host authenticator with one that rejects channel authentication.
   host_authenticator_.reset(new FakeAuthenticator(
       FakeAuthenticator::HOST, 0, FakeAuthenticator::REJECT_CHANNEL, true));
 
   InitializeConnection();
 
-  client_transport_->GetStreamChannelFactory()->CreateChannel(
+  client_transport_->GetChannelFactory()->CreateChannel(
       kChannelName, base::Bind(&IceTransportTest::OnClientChannelCreated,
                                base::Unretained(this)));
-  host_transport_->GetStreamChannelFactory()->CreateChannel(
+  host_transport_->GetChannelFactory()->CreateChannel(
       kChannelName, base::Bind(&IceTransportTest::OnHostChannelCreated,
                                base::Unretained(this)));
 
   run_loop_.reset(new base::RunLoop());
 
-  EXPECT_CALL(host_channel_callback_, OnDone(nullptr))
-      .WillOnce(QuitRunLoop(run_loop_.get()));
+  // The callback should never be called.
+  EXPECT_CALL(host_channel_callback_, OnDone(_)).Times(0);
 
   run_loop_->Run();
 
-  EXPECT_FALSE(host_socket_);
+  EXPECT_FALSE(host_message_pipe_);
+  EXPECT_EQ(CHANNEL_CONNECTION_ERROR, error_);
 
-  client_transport_->GetStreamChannelFactory()->CancelChannelCreation(
+  client_transport_->GetChannelFactory()->CancelChannelCreation(
       kChannelName);
 }
 
 // Verify that channels are never marked connected if connection cannot be
 // established.
 TEST_F(IceTransportTest, TestBrokenTransport) {
   // Allow only incoming connections on both ends, which effectively renders
   // transport unusable.
   network_settings_ = NetworkSettings(NetworkSettings::NAT_TRAVERSAL_DISABLED);
 
   InitializeConnection();
 
-  client_transport_->GetStreamChannelFactory()->CreateChannel(
+  client_transport_->GetChannelFactory()->CreateChannel(
       kChannelName, base::Bind(&IceTransportTest::OnClientChannelCreated,
                                base::Unretained(this)));
-  host_transport_->GetStreamChannelFactory()->CreateChannel(
+  host_transport_->GetChannelFactory()->CreateChannel(
       kChannelName, base::Bind(&IceTransportTest::OnHostChannelCreated,
                                base::Unretained(this)));
 
   message_loop_.RunUntilIdle();
 
   // Verify that neither of the two ends of the channel is connected.
-  EXPECT_FALSE(client_socket_);
-  EXPECT_FALSE(host_socket_);
+  EXPECT_FALSE(client_message_pipe_);
+  EXPECT_FALSE(host_message_pipe_);
 
-  client_transport_->GetStreamChannelFactory()->CancelChannelCreation(
+  client_transport_->GetChannelFactory()->CancelChannelCreation(
       kChannelName);
-  host_transport_->GetStreamChannelFactory()->CancelChannelCreation(
+  host_transport_->GetChannelFactory()->CancelChannelCreation(
       kChannelName);
 }
 
 TEST_F(IceTransportTest, TestCancelChannelCreation) {
   InitializeConnection();
 
-  client_transport_->GetStreamChannelFactory()->CreateChannel(
+  client_transport_->GetChannelFactory()->CreateChannel(
       kChannelName, base::Bind(&IceTransportTest::OnClientChannelCreated,
                                base::Unretained(this)));
-  client_transport_->GetStreamChannelFactory()->CancelChannelCreation(
+  client_transport_->GetChannelFactory()->CancelChannelCreation(
       kChannelName);
 
-  EXPECT_TRUE(!client_socket_.get());
+  EXPECT_TRUE(!client_message_pipe_.get());
 }
 
 // Verify that we can still connect even when there is a delay in signaling
 // messages delivery.
 TEST_F(IceTransportTest, TestDelayedSignaling) {
   transport_info_delay_ = base::TimeDelta::FromMilliseconds(100);
 
   InitializeConnection();
 
-  client_transport_->GetStreamChannelFactory()->CreateChannel(
+  client_transport_->GetChannelFactory()->CreateChannel(
       kChannelName, base::Bind(&IceTransportTest::OnClientChannelCreated,
                                base::Unretained(this)));
-  host_transport_->GetStreamChannelFactory()->CreateChannel(
+  host_transport_->GetChannelFactory()->CreateChannel(
       kChannelName, base::Bind(&IceTransportTest::OnHostChannelCreated,
                                base::Unretained(this)));
 
   WaitUntilConnected();
 
-  StreamConnectionTester tester(host_socket_.get(), client_socket_.get(),
-                                kMessageSize, kMessages);
-  tester.Start();
-  message_loop_.Run();
-  tester.CheckResults();
+  MessagePipeConnectionTester tester(host_message_pipe_.get(),
+                                     client_message_pipe_.get(), kMessageSize,
+                                     kMessages);
+  tester.RunAndCheckResults();
 }
 
 
 }  // namespace protocol
 }  // namespace remoting