diff options
| author | ronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-07 03:54:36 +0000 |
|---|---|---|
| committer | ronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-07 03:54:36 +0000 |
| commit | f7b8158c58694267eea0a4b0f927979dd592ebe0 (patch) | |
| tree | 4b987b9c59e24ca38fa1d99cc9ab521e6baba3fd /jingle | |
| parent | f4d7b90d35f4c8058fe2d461f69da5f0effd09c6 (diff) | |
| download | chromium_src-f7b8158c58694267eea0a4b0f927979dd592ebe0.zip chromium_src-f7b8158c58694267eea0a4b0f927979dd592ebe0.tar.gz chromium_src-f7b8158c58694267eea0a4b0f927979dd592ebe0.tar.bz2 | |
Roll libjingle r313.
Reviewed and tried here:
https://chromiumcodereview.appspot.com/15021002/
TBR=sergeyu@chromium.org
Review URL: https://codereview.chromium.org/14781007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198614 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle')
| -rw-r--r-- | jingle/glue/fake_socket_factory.cc | 4 | ||||
| -rw-r--r-- | jingle/glue/fake_socket_factory.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/jingle/glue/fake_socket_factory.cc b/jingle/glue/fake_socket_factory.cc index 2347bef..325497a 100644 --- a/jingle/glue/fake_socket_factory.cc +++ b/jingle/glue/fake_socket_factory.cc @@ -176,7 +176,7 @@ talk_base::AsyncPacketSocket* FakeSocketFactory::CreateUdpSocket( talk_base::AsyncPacketSocket* FakeSocketFactory::CreateServerTcpSocket( const talk_base::SocketAddress& local_address, int min_port, int max_port, - bool ssl) { + int opts) { // TODO(sergeyu): Implement fake TCP sockets. NOTIMPLEMENTED(); return NULL; @@ -186,7 +186,7 @@ talk_base::AsyncPacketSocket* FakeSocketFactory::CreateClientTcpSocket( const talk_base::SocketAddress& local_address, const talk_base::SocketAddress& remote_address, const talk_base::ProxyInfo& proxy_info, const std::string& user_agent, - bool ssl) { + int opts) { // TODO(sergeyu): Implement fake TCP sockets. NOTIMPLEMENTED(); return NULL; diff --git a/jingle/glue/fake_socket_factory.h b/jingle/glue/fake_socket_factory.h index 6cbfb75..cb56a3c 100644 --- a/jingle/glue/fake_socket_factory.h +++ b/jingle/glue/fake_socket_factory.h @@ -14,7 +14,7 @@ #include "base/threading/non_thread_safe.h" #include "net/base/ip_endpoint.h" #include "third_party/libjingle/source/talk/base/asyncpacketsocket.h" -#include "third_party/libjingle/source/talk/base/packetsocketfactory.h" +#include "third_party/libjingle/source/talk/p2p/base/packetsocketfactory.h" namespace base { class MessageLoop; @@ -102,13 +102,13 @@ class FakeSocketFactory : public talk_base::PacketSocketFactory { int min_port, int max_port) OVERRIDE; virtual talk_base::AsyncPacketSocket* CreateServerTcpSocket( const talk_base::SocketAddress& local_address, int min_port, int max_port, - bool ssl) OVERRIDE; + int opts) OVERRIDE; virtual talk_base::AsyncPacketSocket* CreateClientTcpSocket( const talk_base::SocketAddress& local_address, const talk_base::SocketAddress& remote_address, const talk_base::ProxyInfo& proxy_info, const std::string& user_agent, - bool ssl) OVERRIDE; + int opts) OVERRIDE; private: scoped_refptr<FakeSocketManager> socket_manager_; |