diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-14 18:34:11 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-14 18:34:11 +0000 |
| commit | 106e9838456b44c86401d99cd4484cf648378751 (patch) | |
| tree | aebbba27670e70f4129827186d2a5bcabe1051d2 /remoting | |
| parent | 38076f10f1dcb85a52e5c992909c035716437e4e (diff) | |
| download | chromium_src-106e9838456b44c86401d99cd4484cf648378751.zip chromium_src-106e9838456b44c86401d99cd4484cf648378751.tar.gz chromium_src-106e9838456b44c86401d99cd4484cf648378751.tar.bz2 | |
Roll webrtc 5104:5122
R=mallinath@chromium.org
Review URL: https://codereview.chromium.org/61793015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235193 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
4 files changed, 14 insertions, 0 deletions
diff --git a/remoting/client/plugin/pepper_packet_socket_factory.cc b/remoting/client/plugin/pepper_packet_socket_factory.cc index 1295a60..a698479 100644 --- a/remoting/client/plugin/pepper_packet_socket_factory.cc +++ b/remoting/client/plugin/pepper_packet_socket_factory.cc @@ -375,4 +375,10 @@ talk_base::AsyncPacketSocket* PepperPacketSocketFactory::CreateClientTcpSocket( return NULL; } +talk_base::AsyncResolverInterface* +PepperPacketSocketFactory::CreateAsyncResolver() { + NOTREACHED(); + return NULL; +} + } // namespace remoting diff --git a/remoting/client/plugin/pepper_packet_socket_factory.h b/remoting/client/plugin/pepper_packet_socket_factory.h index 51cde23..144173b 100644 --- a/remoting/client/plugin/pepper_packet_socket_factory.h +++ b/remoting/client/plugin/pepper_packet_socket_factory.h @@ -30,6 +30,7 @@ class PepperPacketSocketFactory : public talk_base::PacketSocketFactory { const talk_base::ProxyInfo& proxy_info, const std::string& user_agent, int opts) OVERRIDE; + virtual talk_base::AsyncResolverInterface* CreateAsyncResolver() OVERRIDE; private: const pp::InstanceHandle pp_instance_; diff --git a/remoting/jingle_glue/chromium_socket_factory.cc b/remoting/jingle_glue/chromium_socket_factory.cc index f95dff3..32e05af 100644 --- a/remoting/jingle_glue/chromium_socket_factory.cc +++ b/remoting/jingle_glue/chromium_socket_factory.cc @@ -371,4 +371,10 @@ ChromiumPacketSocketFactory::CreateClientTcpSocket( return NULL; } +talk_base::AsyncResolverInterface* +ChromiumPacketSocketFactory::CreateAsyncResolver() { + NOTREACHED(); + return NULL; +} + } // namespace remoting diff --git a/remoting/jingle_glue/chromium_socket_factory.h b/remoting/jingle_glue/chromium_socket_factory.h index eb70b5b..0c66982 100644 --- a/remoting/jingle_glue/chromium_socket_factory.h +++ b/remoting/jingle_glue/chromium_socket_factory.h @@ -28,6 +28,7 @@ class ChromiumPacketSocketFactory : public talk_base::PacketSocketFactory { const talk_base::ProxyInfo& proxy_info, const std::string& user_agent, int opts) OVERRIDE; + virtual talk_base::AsyncResolverInterface* CreateAsyncResolver() OVERRIDE; private: DISALLOW_COPY_AND_ASSIGN(ChromiumPacketSocketFactory); |