Add TransportContext class.

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/chromium_port_allocator.h"
 #include "remoting/protocol/connection_tester.h"
 #include "remoting/protocol/fake_authenticator.h"
-#include "remoting/protocol/ice_transport_factory.h"
+#include "remoting/protocol/ice_transport.h"
 #include "remoting/protocol/jingle_session_manager.h"
 #include "remoting/protocol/network_settings.h"
+#include "remoting/protocol/transport_context.h"
 #include "remoting/signaling/fake_signal_strategy.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::_;
 using testing::AtLeast;
 using testing::AtMost;
 using testing::DeleteArg;
 using testing::DoAll;
 using testing::InSequence;
@@ skipping 60 matching lines @@
     client_session_.reset();
   }
 
   void CreateSessionManagers(int auth_round_trips, int messages_till_start,
                              FakeAuthenticator::Action auth_action) {
     host_signal_strategy_.reset(new FakeSignalStrategy(kHostJid));
     client_signal_strategy_.reset(new FakeSignalStrategy(kClientJid));
     FakeSignalStrategy::Connect(host_signal_strategy_.get(),
                                 client_signal_strategy_.get());
 
-    scoped_ptr<TransportFactory> host_transport(new IceTransportFactory(
-        nullptr,
-        ChromiumPortAllocator::Create(nullptr, network_settings_).Pass(),
-        network_settings_, TransportRole::SERVER));
-    host_server_.reset(new JingleSessionManager(host_transport.Pass()));
+    host_server_.reset(new JingleSessionManager(
+        make_scoped_ptr(new IceTransportFactory(new TransportContext(
+            nullptr, make_scoped_ptr(new ChromiumPortAllocatorFactory(nullptr)),
+            network_settings_, TransportRole::SERVER)))));
     host_server_->Init(host_signal_strategy_.get(), &host_server_listener_);
 
     scoped_ptr<AuthenticatorFactory> factory(
         new FakeHostAuthenticatorFactory(auth_round_trips,
           messages_till_start, auth_action, true));
     host_server_->set_authenticator_factory(factory.Pass());
 
-    scoped_ptr<TransportFactory> client_transport(new IceTransportFactory(
-        nullptr,
-        ChromiumPortAllocator::Create(nullptr, network_settings_).Pass(),
-        network_settings_, TransportRole::CLIENT));
-    client_server_.reset(
-        new JingleSessionManager(client_transport.Pass()));
+    client_server_.reset(new JingleSessionManager(
+        make_scoped_ptr(new IceTransportFactory(new TransportContext(
+            nullptr, make_scoped_ptr(new ChromiumPortAllocatorFactory(nullptr)),
+            network_settings_, TransportRole::CLIENT)))));
     client_server_->Init(client_signal_strategy_.get(),
                          &client_server_listener_);
   }
 
   void CreateSessionManagers(int auth_round_trips,
                              FakeAuthenticator::Action auth_action) {
     CreateSessionManagers(auth_round_trips, 0, auth_action);
   }
 
   void CloseSessionManager() {
@@ skipping 271 matching lines @@
 
 // Verify that we can connect with multistep authentication.
 TEST_F(JingleSessionTest, TestMultistepAuth) {
   CreateSessionManagers(3, FakeAuthenticator::ACCEPT);
   ASSERT_NO_FATAL_FAILURE(
       InitiateConnection(3, FakeAuthenticator::ACCEPT, false));
 }
 
 }  // namespace protocol
 }  // namespace remoting