| Index: webrtc/p2p/client/httpportallocator.h
|
| diff --git a/webrtc/p2p/client/httpportallocator.h b/webrtc/p2p/client/httpportallocator.h
|
| index e2fa74354d29e8ba85d94acfcbc24a0a4d59dbdd..e52765901f7c927466410daa1ec2c218e149aaaa 100644
|
| --- a/webrtc/p2p/client/httpportallocator.h
|
| +++ b/webrtc/p2p/client/httpportallocator.h
|
| @@ -26,6 +26,12 @@ class SignalThread;
|
|
|
| namespace cricket {
|
|
|
| +// TODO(pthatcher): Remove this. It's only used by chromoting, so we
|
| +// should just move this code there. It's used in these places in
|
| +// chromium:
|
| +// src/remoting/protocol/chromium_port_allocator.cc
|
| +// src/remoting/client/plugin/pepper_port_allocator.cc
|
| +// src/remoting/protocol/libjingle_transport_factory.cc
|
| class HttpPortAllocatorBase : public BasicPortAllocator {
|
| public:
|
| // The number of HTTP requests we should attempt before giving up.
|
| @@ -130,44 +136,6 @@ class HttpPortAllocatorSessionBase : public BasicPortAllocatorSession {
|
| int attempts_;
|
| };
|
|
|
| -class HttpPortAllocator : public HttpPortAllocatorBase {
|
| - public:
|
| - HttpPortAllocator(rtc::NetworkManager* network_manager,
|
| - const std::string& user_agent);
|
| - HttpPortAllocator(rtc::NetworkManager* network_manager,
|
| - rtc::PacketSocketFactory* socket_factory,
|
| - const std::string& user_agent);
|
| - virtual ~HttpPortAllocator();
|
| - virtual PortAllocatorSession* CreateSessionInternal(
|
| - const std::string& content_name,
|
| - int component,
|
| - const std::string& ice_ufrag, const std::string& ice_pwd);
|
| -};
|
| -
|
| -class HttpPortAllocatorSession : public HttpPortAllocatorSessionBase {
|
| - public:
|
| - HttpPortAllocatorSession(
|
| - HttpPortAllocator* allocator,
|
| - const std::string& content_name,
|
| - int component,
|
| - const std::string& ice_ufrag,
|
| - const std::string& ice_pwd,
|
| - const std::vector<rtc::SocketAddress>& stun_hosts,
|
| - const std::vector<std::string>& relay_hosts,
|
| - const std::string& relay,
|
| - const std::string& agent);
|
| - virtual ~HttpPortAllocatorSession();
|
| -
|
| - virtual void SendSessionRequest(const std::string& host, int port);
|
| -
|
| - protected:
|
| - // Protected for diagnostics.
|
| - virtual void OnRequestDone(rtc::SignalThread* request);
|
| -
|
| - private:
|
| - std::list<rtc::AsyncHttpRequest*> requests_;
|
| -};
|
| -
|
| } // namespace cricket
|
|
|
| #endif // WEBRTC_P2P_CLIENT_HTTPPORTALLOCATOR_H_
|
|
|