Move PseudoTCP and channel auth out of LibjingleTransportFactory.

remoting/protocol/jingle_session_unittest.cc

 // Copyright (c) 2012 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/jingle_session.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/test/test_timeouts.h"
 #include "base/time/time.h"
 #include "jingle/glue/thread_wrapper.h"
 #include "net/socket/socket.h"
 #include "net/socket/stream_socket.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "remoting/base/constants.h"
 #include "remoting/protocol/authenticator.h"
 #include "remoting/protocol/channel_authenticator.h"
+#include "remoting/protocol/channel_factory.h"
 #include "remoting/protocol/chromium_port_allocator.h"
 #include "remoting/protocol/connection_tester.h"
 #include "remoting/protocol/fake_authenticator.h"
 #include "remoting/protocol/jingle_session_manager.h"
 #include "remoting/protocol/libjingle_transport_factory.h"
 #include "remoting/protocol/network_settings.h"
 #include "remoting/signaling/fake_signal_strategy.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 472 matching lines @@
 
   client_session_->GetTransportChannelFactory()->CreateChannel(
       kChannelName, base::Bind(&JingleSessionTest::OnClientChannelCreated,
                                base::Unretained(this)));
   host_session_->GetTransportChannelFactory()->CreateChannel(
       kChannelName, base::Bind(&JingleSessionTest::OnHostChannelCreated,
                                base::Unretained(this)));
 
   // Terminate the message loop when we get rejection notification
   // from the host.
+  bool client_callback_called = false;
   EXPECT_CALL(host_channel_callback_, OnDone(NULL))
       .WillOnce(QuitThread());
   EXPECT_CALL(client_channel_callback_, OnDone(_))
-      .Times(AtMost(1));
+      .Times(AtMost(1))
+      .WillOnce(testing::Assign(&client_callback_called, true));
   ExpectRouteChange(kChannelName);
 
   message_loop_->Run();
 
+  if (!client_callback_called) {

[Wez, 2014/09/10 02:29:26]

Why would the callback not be called, after this change?

[Sergey Ulanov, 2014/09/10 21:50:59]

It's not called and DCHECKs were failing because CancelChannelCreation() wasn't
called. JingleSession wasn't DCHECKing that CancelChannelCreation() is called
before the destructor (fixed it now), but SecureChannelFactory does.

There is nothing that prescribes the order in which the client and host
callbacks are called in this case, so the test hast to handle both cases when
the client callback is called and when it's not.

[Wez, 2014/09/10 22:19:41]

Should we make the test ordering deterministic, and break it into two tests, one
for each of the orderings, then?

[Sergey Ulanov, 2014/09/10 22:49:30]

Done. I don't think we need two tests here - this test verifies what happens on
the side of the connection that rejects channel auth. What happens on the other
end is irrelevant.

+    client_session_->GetTransportChannelFactory()->CancelChannelCreation(
+        kChannelName);
+  }
+
   EXPECT_TRUE(!host_socket_.get());
 }
 
 }  // namespace protocol
 }  // namespace remoting