Revert "Update webrtc&libjingle 6774:6799."

jingle/glue/utils.h

Index: jingle/glue/utils.h
diff --git a/jingle/glue/utils.h b/jingle/glue/utils.h
index cb42b4baa4223425c5ff2b6f63500f15c30e8438..a655f71a2fceb7620ff3b0a7c334979c4989a7db 100644
--- a/jingle/glue/utils.h
+++ b/jingle/glue/utils.h
@@ -11,9 +11,9 @@ namespace net {
 class IPEndPoint;
 }  // namespace net
 
-namespace rtc {
+namespace talk_base {
 class SocketAddress;
-}  // namespace rtc
+}  // namespace talk_base
 
 namespace cricket {
 class Candidate;
@@ -25,8 +25,8 @@ namespace jingle_glue {
 // following two functions are used to convert addresses from one
 // representation to another.
 bool IPEndPointToSocketAddress(const net::IPEndPoint& ip_endpoint,
-                               rtc::SocketAddress* address);
-bool SocketAddressToIPEndPoint(const rtc::SocketAddress& address,
+                               talk_base::SocketAddress* address);
+bool SocketAddressToIPEndPoint(const talk_base::SocketAddress& address,
                                net::IPEndPoint* ip_endpoint);
 
 // Helper functions to serialize and deserialize P2P candidates.