Update talk to 52534915.
R=sergeyu@chromium.org
Review URL: https://webrtc-codereview.appspot.com/2251004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@4786 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/talk/p2p/client/httpportallocator.h b/talk/p2p/client/httpportallocator.h
index cb4c8f8..a0ef3b7 100644
--- a/talk/p2p/client/httpportallocator.h
+++ b/talk/p2p/client/httpportallocator.h
@@ -32,7 +32,6 @@
#include <string>
#include <vector>
-#include "talk/base/gunit_prod.h"
#include "talk/p2p/client/basicportallocator.h"
class HttpPortAllocatorTest_TestSessionRequestUrl_Test;
@@ -129,6 +128,9 @@
virtual void SendSessionRequest(const std::string& host, int port) = 0;
virtual void ReceiveSessionResponse(const std::string& response);
+ // Made public for testing. Should be protected.
+ std::string GetSessionRequestUrl();
+
protected:
virtual void GetPortConfigurations();
void TryCreateRelaySession();
@@ -137,11 +139,7 @@
BasicPortAllocatorSession::allocator());
}
- std::string GetSessionRequestUrl();
-
private:
- FRIEND_TEST(::HttpPortAllocatorTest, TestSessionRequestUrl);
-
std::vector<std::string> relay_hosts_;
std::vector<talk_base::SocketAddress> stun_hosts_;
std::string relay_token_;