diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-26 20:53:14 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-26 20:53:14 +0000 |
| commit | ae48adcd5ec344a0b0c2ff9c443897d73207f7f4 (patch) | |
| tree | fe42b96739dd778e910a5c72f3aa3f9074af4831 /content | |
| parent | 7dd385150f61d0da787be6e5e1e5f819e6186699 (diff) | |
| download | chromium_src-ae48adcd5ec344a0b0c2ff9c443897d73207f7f4.zip chromium_src-ae48adcd5ec344a0b0c2ff9c443897d73207f7f4.tar.gz chromium_src-ae48adcd5ec344a0b0c2ff9c443897d73207f7f4.tar.bz2 | |
Add SetProperti() in the PPB_Transport_Dev interface.
BUG=41776
TEST=Unittests
Review URL: http://codereview.chromium.org/7713021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98485 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/renderer/p2p/p2p_transport_impl.cc | 5 | ||||
| -rw-r--r-- | content/renderer/p2p/p2p_transport_impl.h | 2 | ||||
| -rw-r--r-- | content/renderer/p2p/p2p_transport_impl_unittest.cc | 7 |
3 files changed, 6 insertions, 8 deletions
diff --git a/content/renderer/p2p/p2p_transport_impl.cc b/content/renderer/p2p/p2p_transport_impl.cc index c83d10f..02f0a9d 100644 --- a/content/renderer/p2p/p2p_transport_impl.cc +++ b/content/renderer/p2p/p2p_transport_impl.cc @@ -42,7 +42,7 @@ P2PTransportImpl::~P2PTransportImpl() { bool P2PTransportImpl::Init(const std::string& name, Protocol protocol, - const std::string& config, + const Config& config, EventHandler* event_handler) { DCHECK(event_handler); @@ -53,8 +53,7 @@ bool P2PTransportImpl::Init(const std::string& name, name_ = name; event_handler_ = event_handler; - // TODO(sergeyu): Implement PortAllocator that can parse |config| - // and use it here instead of BasicPortAllocator. + // TODO(sergeyu): Use STUN/Relay settings from |config|. allocator_.reset(new cricket::BasicPortAllocator( network_manager_.get(), socket_factory_.get())); diff --git a/content/renderer/p2p/p2p_transport_impl.h b/content/renderer/p2p/p2p_transport_impl.h index 43be3bca..6e46b15 100644 --- a/content/renderer/p2p/p2p_transport_impl.h +++ b/content/renderer/p2p/p2p_transport_impl.h @@ -54,7 +54,7 @@ class P2PTransportImpl : public webkit_glue::P2PTransport, // webkit_glue::P2PTransport interface. virtual bool Init(const std::string& name, Protocol protocol, - const std::string& config, + const Config& config, EventHandler* event_handler) OVERRIDE; virtual bool AddRemoteCandidate(const std::string& address) OVERRIDE; virtual net::Socket* GetChannel() OVERRIDE; diff --git a/content/renderer/p2p/p2p_transport_impl_unittest.cc b/content/renderer/p2p/p2p_transport_impl_unittest.cc index b384170..bf6f8d9 100644 --- a/content/renderer/p2p/p2p_transport_impl_unittest.cc +++ b/content/renderer/p2p/p2p_transport_impl_unittest.cc @@ -33,8 +33,6 @@ const char kTestAddress2[] = "192.168.15.33"; const char kTransportName1[] = "tr1"; const char kTransportName2[] = "tr2"; -const char kTestConfig[] = ""; - // Send 10 packets 10 bytes each. Packets are sent with 10ms delay // between packets (about 100 ms for 10 messages). const int kMessageSize = 10; @@ -353,10 +351,11 @@ class P2PTransportImplTest : public testing::Test { } void Init(P2PTransport::Protocol protocol) { + P2PTransport::Config config; ASSERT_TRUE(transport1_->Init( - kTransportName1, protocol, kTestConfig, &event_handler1_)); + kTransportName1, protocol, config, &event_handler1_)); ASSERT_TRUE(transport2_->Init( - kTransportName2, protocol, kTestConfig, &event_handler2_)); + kTransportName2, protocol, config, &event_handler2_)); } MessageLoop message_loop_; |