From 3623ef76ca3a58a41be3c8e2d76f3ac1e4b9a1b5 Mon Sep 17 00:00:00 2001 From: "sergeyu@chromium.org" Date: Fri, 23 Sep 2011 19:11:34 +0000 Subject: Remove old sandboxing-related code. 1. Remove sandboxing code from JingleSessionManager 2. Remove custom port allocator used by chromoting. 3. Remove code for STUN server address resolution from JingleInfoRequest and HostResolver interface. BUG=None TEST=compiles. Review URL: http://codereview.chromium.org/7969019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102545 0039d316-1c4b-4281-b951-d872f2087c98 --- remoting/jingle_glue/jingle_info_request.h | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'remoting/jingle_glue/jingle_info_request.h') diff --git a/remoting/jingle_glue/jingle_info_request.h b/remoting/jingle_glue/jingle_info_request.h index df7552f..6d5bcf6 100644 --- a/remoting/jingle_glue/jingle_info_request.h +++ b/remoting/jingle_glue/jingle_info_request.h @@ -27,8 +27,6 @@ class SocketAddress; namespace remoting { class IqRequest; -class HostResolver; -class HostResolverFactory; // JingleInfoRequest handles requesting STUN/Relay infromation from // the Google Talk network. The query is made when Send() is @@ -49,8 +47,7 @@ class JingleInfoRequest : public sigslot::has_slots<> { const std::string&, const std::vector&, const std::vector&)> OnJingleInfoCallback; - explicit JingleInfoRequest(IqRequest* request, - HostResolverFactory* host_resolver_factory); + explicit JingleInfoRequest(IqRequest* request); virtual ~JingleInfoRequest(); void Send(const OnJingleInfoCallback& callback); @@ -59,19 +56,10 @@ class JingleInfoRequest : public sigslot::has_slots<> { struct PendingDnsRequest; void OnResponse(const buzz::XmlElement* stanza); - void OnStunAddressResponse(HostResolver* resolver, - const talk_base::SocketAddress& address); - HostResolverFactory* host_resolver_factory_; scoped_ptr request_; OnJingleInfoCallback on_jingle_info_cb_; - std::vector relay_hosts_; - std::vector stun_hosts_; - std::string relay_token_; - - std::set stun_dns_requests_; - DISALLOW_COPY_AND_ASSIGN(JingleInfoRequest); }; -- cgit v1.1