Add TransportContext class.

remoting/test/protocol_perftest.cc

 // Copyright 2014 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 "base/base64.h"
 #include "base/files/file_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/rand_util.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/thread_task_runner_handle.h"
 #include "jingle/glue/thread_wrapper.h"
 #include "net/base/test_data_directory.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "remoting/base/rsa_key_pair.h"
 #include "remoting/client/audio_player.h"
 #include "remoting/client/chromoting_client.h"
 #include "remoting/client/client_context.h"
 #include "remoting/client/client_user_interface.h"
 #include "remoting/client/video_renderer.h"
 #include "remoting/host/chromoting_host.h"
 #include "remoting/host/chromoting_host_context.h"
 #include "remoting/host/fake_desktop_environment.h"
-#include "remoting/protocol/ice_transport_factory.h"
+#include "remoting/protocol/ice_transport.h"
 #include "remoting/protocol/jingle_session_manager.h"
 #include "remoting/protocol/me2me_host_authenticator_factory.h"
 #include "remoting/protocol/negotiating_client_authenticator.h"
 #include "remoting/protocol/session_config.h"
+#include "remoting/protocol/transport_context.h"
 #include "remoting/protocol/video_frame_pump.h"
 #include "remoting/signaling/fake_signal_strategy.h"
 #include "remoting/test/fake_network_dispatcher.h"
 #include "remoting/test/fake_port_allocator.h"
 #include "remoting/test/fake_socket_factory.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace remoting {
 
 using protocol::ChannelConfig;
@@ skipping 177 matching lines @@
     DCHECK(host_thread_.task_runner()->BelongsToCurrentThread());
 
     jingle_glue::JingleThreadWrapper::EnsureForCurrentMessageLoop();
 
     host_signaling_.reset(new FakeSignalStrategy(kHostJid));
     host_signaling_->ConnectTo(client_signaling_.get());
 
     protocol::NetworkSettings network_settings(
         protocol::NetworkSettings::NAT_TRAVERSAL_OUTGOING);
 
-    scoped_ptr<FakePortAllocator> port_allocator(
-        FakePortAllocator::Create(fake_network_dispatcher_));
-    port_allocator->socket_factory()->SetBandwidth(GetParam().bandwidth,
-                                                   GetParam().max_buffers);
-    port_allocator->socket_factory()->SetLatency(GetParam().latency_average,
-                                                 GetParam().latency_stddev);
-    port_allocator->socket_factory()->set_out_of_order_rate(
+    scoped_ptr<FakePortAllocatorFactory> port_allocator_factory(
+        new FakePortAllocatorFactory(fake_network_dispatcher_));
+    port_allocator_factory->socket_factory()->SetBandwidth(
+        GetParam().bandwidth, GetParam().max_buffers);
+    port_allocator_factory->socket_factory()->SetLatency(
+        GetParam().latency_average, GetParam().latency_stddev);
+    port_allocator_factory->socket_factory()->set_out_of_order_rate(
         GetParam().out_of_order_rate);
-    scoped_ptr<protocol::TransportFactory> host_transport_factory(
-        new protocol::IceTransportFactory(
-            host_signaling_.get(), port_allocator.Pass(), network_settings,
-            protocol::TransportRole::SERVER));
+    scoped_refptr<protocol::TransportContext> transport_context(
+        new protocol::TransportContext(
+            host_signaling_.get(), port_allocator_factory.Pass(),
+            network_settings, protocol::TransportRole::SERVER));
 
     scoped_ptr<protocol::SessionManager> session_manager(
-        new protocol::JingleSessionManager(host_transport_factory.Pass()));
+        new protocol::JingleSessionManager(make_scoped_ptr(
+            new protocol::IceTransportFactory(transport_context))));
     session_manager->set_protocol_config(protocol_config_->Clone());
 
     // Encoder runs on a separate thread, main thread is used for everything
     // else.
     host_.reset(new ChromotingHost(host_signaling_.get(),
                                    &desktop_environment_factory_,
                                    session_manager.Pass(),
                                    host_thread_.task_runner(),
                                    host_thread_.task_runner(),
                                    capture_thread_.task_runner(),
                                    encode_thread_.task_runner(),
                                    host_thread_.task_runner(),
                                    host_thread_.task_runner()));
 
     base::FilePath certs_dir(net::GetTestCertsDirectory());
 
     std::string host_cert;
     ASSERT_TRUE(base::ReadFileToString(
         certs_dir.AppendASCII("unittest.selfsigned.der"), &host_cert));
 
     base::FilePath key_path = certs_dir.AppendASCII("unittest.key.bin");
     std::string key_string;
     ASSERT_TRUE(base::ReadFileToString(key_path, &key_string));
     std::string key_base64;
     base::Base64Encode(key_string, &key_base64);
     scoped_refptr<RsaKeyPair> key_pair = RsaKeyPair::FromString(key_base64);
     ASSERT_TRUE(key_pair.get());
 
-
     protocol::SharedSecretHash host_secret;
     host_secret.hash_function = protocol::AuthenticationMethod::NONE;
     host_secret.value = "123456";
     scoped_ptr<protocol::AuthenticatorFactory> auth_factory =
         protocol::Me2MeHostAuthenticatorFactory::CreateWithSharedSecret(
             true, kHostOwner, host_cert, key_pair, host_secret, nullptr);
     host_->SetAuthenticatorFactory(auth_factory.Pass());
 
     host_->AddStatusObserver(this);
     host_->Start(kHostOwner);
 
     message_loop_.PostTask(FROM_HERE,
                            base::Bind(&ProtocolPerfTest::StartClientAfterHost,
                                       base::Unretained(this)));
   }
 
   void StartClientAfterHost() {
     client_signaling_->ConnectTo(host_signaling_.get());
 
     protocol::NetworkSettings network_settings(
         protocol::NetworkSettings::NAT_TRAVERSAL_OUTGOING);
 
     // Initialize client.
     client_context_.reset(
         new ClientContext(base::ThreadTaskRunnerHandle::Get()));
 
-    scoped_ptr<FakePortAllocator> port_allocator(
-        FakePortAllocator::Create(fake_network_dispatcher_));
-    port_allocator->socket_factory()->SetBandwidth(GetParam().bandwidth,
-                                                   GetParam().max_buffers);
-    port_allocator->socket_factory()->SetLatency(GetParam().latency_average,
-                                                 GetParam().latency_stddev);
-    port_allocator->socket_factory()->set_out_of_order_rate(
+    scoped_ptr<FakePortAllocatorFactory> port_allocator_factory(
+        new FakePortAllocatorFactory(fake_network_dispatcher_));
+    port_allocator_factory->socket_factory()->SetBandwidth(
+        GetParam().bandwidth, GetParam().max_buffers);
+    port_allocator_factory->socket_factory()->SetLatency(
+        GetParam().latency_average, GetParam().latency_stddev);
+    port_allocator_factory->socket_factory()->set_out_of_order_rate(
         GetParam().out_of_order_rate);
-    scoped_ptr<protocol::TransportFactory> client_transport_factory(
-        new protocol::IceTransportFactory(
-            client_signaling_.get(), port_allocator.Pass(), network_settings,
-            protocol::TransportRole::CLIENT));
+    scoped_refptr<protocol::TransportContext> transport_context(
+        new protocol::TransportContext(
+            host_signaling_.get(), port_allocator_factory.Pass(),
+            network_settings, protocol::TransportRole::SERVER));
 
     std::vector<protocol::AuthenticationMethod> auth_methods;
     auth_methods.push_back(protocol::AuthenticationMethod::Spake2(
         protocol::AuthenticationMethod::NONE));
     scoped_ptr<protocol::Authenticator> client_authenticator(
         new protocol::NegotiatingClientAuthenticator(
             std::string(),  // client_pairing_id
             std::string(),  // client_pairing_secret
             std::string(),  // authentication_tag
             base::Bind(&ProtocolPerfTest::FetchPin, base::Unretained(this)),
             nullptr,
             auth_methods));
     client_.reset(
         new ChromotingClient(client_context_.get(), this, this, nullptr));
     client_->set_protocol_config(protocol_config_->Clone());
     client_->Start(client_signaling_.get(), client_authenticator.Pass(),
-                   client_transport_factory.Pass(), kHostJid, std::string());
+                   transport_context, kHostJid, std::string());
   }
 
   void FetchPin(
       bool pairing_supported,
       const protocol::SecretFetchedCallback& secret_fetched_callback) {
     secret_fetched_callback.Run("123456");
   }
 
   base::MessageLoopForIO message_loop_;
 
@@ skipping 149 matching lines @@
               << "ms Encode: " << last_video_packet_->encode_time_ms()
               << "ms Capture: " << last_video_packet_->capture_time_ms()
               << "ms";
     sum += latency;
   }
 
   LOG(INFO) << "Average: " << (sum / kFrames).InMillisecondsF();
 }
 
 }  // namespace remoting