Revert "Update webrtc&libjingle 6774:6799."

jingle/notifier/communicator/connection_settings.h

Index: jingle/notifier/communicator/connection_settings.h
diff --git a/jingle/notifier/communicator/connection_settings.h b/jingle/notifier/communicator/connection_settings.h
index 9091fcbf24bb8fa4778a8d03fcff67a0340b1097..fe0f6b03d1854a7b3f902de78ae12bfb08ecbe39 100644
--- a/jingle/notifier/communicator/connection_settings.h
+++ b/jingle/notifier/communicator/connection_settings.h
@@ -10,7 +10,7 @@
 
 #include "base/basictypes.h"
 #include "jingle/notifier/base/server_information.h"
-#include "webrtc/base/socketaddress.h"
+#include "talk/base/socketaddress.h"
 
 namespace buzz {
 class XmppClientSettings;
@@ -25,7 +25,7 @@ enum SslTcpMode { DO_NOT_USE_SSLTCP, USE_SSLTCP };
 
 struct ConnectionSettings {
  public:
-  ConnectionSettings(const rtc::SocketAddress& server,
+  ConnectionSettings(const talk_base::SocketAddress& server,
                      SslTcpMode ssltcp_mode,
                      SslTcpSupport ssltcp_support);
   ConnectionSettings();
@@ -38,7 +38,7 @@ struct ConnectionSettings {
   // Fill in the connection-related fields of |client_settings|.
   void FillXmppClientSettings(buzz::XmppClientSettings* client_settings) const;
 
-  rtc::SocketAddress server;
+  talk_base::SocketAddress server;
   SslTcpMode ssltcp_mode;
   SslTcpSupport ssltcp_support;
 };