(Auto)update libjingle 64247466-> 64326665

git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@5845 4adac7df-926f-26a2-2b94-8c16560cd09d

5 files changed, 0 insertions, 61 deletions

diff --git a/p2p/base/session_unittest.cc b/p2p/base/session_unittest.cc
index 074cb1c..1c08bf1 100644
--- a/p2p/base/session_unittest.cc
+++ b/p2p/base/session_unittest.cc
@@ -77,19 +77,6 @@ static const int kNumPorts = 2;
 static const int kPort0 = 28653;
 static const int kPortStep = 5;
 
-static const std::string kNotifyNick1 = "derekcheng_google.com^59422C27";
-static const std::string kNotifyNick2 = "someoneelses_google.com^7abd6a7a20";
-static const uint32 kNotifyAudioSsrc1 = 2625839801U;
-static const uint32 kNotifyAudioSsrc2 = 2529430427U;
-static const uint32 kNotifyVideoSsrc1 = 3;
-static const uint32 kNotifyVideoSsrc2 = 2;
-
-static const std::string kViewRequestNick = "param_google.com^16A3CDBE";
-static const uint32 kViewRequestSsrc = 4;
-static const int kViewRequestWidth = 320;
-static const int kViewRequestHeight = 200;
-static const int kViewRequestFrameRate = 15;
-
 int GetPort(int port_index) {
   return kPort0 + (port_index * kPortStep);
 }
diff --git a/p2p/base/stun_unittest.cc b/p2p/base/stun_unittest.cc
index dc78d38..71d8750 100644
--- a/p2p/base/stun_unittest.cc
+++ b/p2p/base/stun_unittest.cc
@@ -208,37 +208,6 @@ static const unsigned char kStunMessageWithErrorAttribute[] = {
   0x69, 0x7a, 0x65, 0x64
 };
 
-// Message with an address attribute with an unknown address family,
-// and a byte string attribute. Check that we quit reading after the
-// bogus address family and don't read the username attribute.
-static const unsigned char kStunMessageWithInvalidAddressFamily[] = {
-  0x01, 0x01, 0x00, 0x18,   // binding response, length 24
-  0x21, 0x12, 0xa4, 0x42,   // magic cookie
-  0x29, 0x1f, 0xcd, 0x7c,   // transaction ID
-  0xba, 0x58, 0xab, 0xd7,
-  0xf2, 0x41, 0x01, 0x00,
-  0x00, 0x01, 0x00, 0x08,  // Mapped address, 4 byte length
-  0x00, 0x09, 0xfe, 0xed,  // Bogus address family (port unimportant).
-  0xac, 0x17, 0x44, 0xe6,  // Should be skipped.
-  0x00, 0x06, 0x00, 0x08,  // Username attribute (length 8)
-  0x61, 0x62, 0x63, 0x64,  // abcdefgh
-  0x65, 0x66, 0x67, 0x68
-};
-
-// Message with an address attribute with an invalid address length.
-// Should fail to be read.
-static const unsigned char kStunMessageWithInvalidAddressLength[] = {
-  0x01, 0x01, 0x00, 0x18,   // binding response, length 24
-  0x21, 0x12, 0xa4, 0x42,   // magic cookie
-  0x29, 0x1f, 0xcd, 0x7c,   // transaction ID
-  0xba, 0x58, 0xab, 0xd7,
-  0xf2, 0x41, 0x01, 0x00,
-  0x00, 0x01, 0x00, 0x0c,  // Mapped address, 12 byte length
-  0x00, 0x01, 0xfe, 0xed,  // Claims to be AF_INET.
-  0xac, 0x17, 0x44, 0xe6,
-  0x00, 0x06, 0x00, 0x08
-};
-
 // Sample messages with an invalid length Field
 
 // The actual length in bytes of the invalid messages (including STUN header)
@@ -511,19 +480,10 @@ const in6_addr kIPv6TestAddress2 = { { { 0x24, 0x01, 0xfa, 0x00,
                                          0x06, 0x0c, 0xce, 0xff,
                                          0xfe, 0x1f, 0x61, 0xa4 } } };
 
-// This is kIPv6TestAddress1 xor-ed with kTestTransactionID2.
-const in6_addr kIPv6XoredTestAddress = { { { 0x05, 0x13, 0x5e, 0x42,
-                                             0xe3, 0xad, 0x56, 0xe1,
-                                             0xc2, 0x30, 0x99, 0x9d,
-                                             0xaa, 0xed, 0x01, 0xc3 } } };
-
 #ifdef POSIX
 const in_addr kIPv4TestAddress1 =  { 0xe64417ac };
-// This is kIPv4TestAddress xored with the STUN magic cookie.
-const in_addr kIPv4XoredTestAddress = { 0x8d05e0a4 };
 #elif defined WIN32
 // Windows in_addr has a union with a uchar[] array first.
-const in_addr kIPv4XoredTestAddress = { { 0x8d, 0x05, 0xe0, 0xa4 } };
 const in_addr kIPv4TestAddress1 =  { { 0x0ac, 0x017, 0x044, 0x0e6 } };
 #endif
 const char kTestUserName1[] = "abcdefgh";
diff --git a/p2p/base/turnserver.cc b/p2p/base/turnserver.cc
index 6595b2f..4d7f39e 100644
--- a/p2p/base/turnserver.cc
+++ b/p2p/base/turnserver.cc
@@ -57,8 +57,6 @@ static const size_t kNonceSize = 40;
 static const size_t TURN_CHANNEL_HEADER_SIZE = 4U;
 
 // TODO(mallinath) - Move these to a common place.
-static const size_t kMaxPacketSize = 64 * 1024;
-
 inline bool IsTurnChannelData(uint16 msg_type) {
   // The first two bits of a channel data message are 0b01.
   return ((msg_type & 0xC000) == 0x4000);
diff --git a/p2p/client/connectivitychecker.cc b/p2p/client/connectivitychecker.cc
index 1075bd6..1b59943 100644
--- a/p2p/client/connectivitychecker.cc
+++ b/p2p/client/connectivitychecker.cc
@@ -22,10 +22,6 @@
 
 namespace cricket {
 
-static const char kSessionTypeVideo[] =
-    "http://www.google.com/session/video";
-static const char kSessionNameRtp[] = "rtp";
-
 static const char kDefaultStunHostname[] = "stun.l.google.com";
 static const int kDefaultStunPort = 19302;
 
diff --git a/p2p/client/connectivitychecker_unittest.cc b/p2p/client/connectivitychecker_unittest.cc
index fe1cb9b..59fdfc2 100644
--- a/p2p/client/connectivitychecker_unittest.cc
+++ b/p2p/client/connectivitychecker_unittest.cc
@@ -23,8 +23,6 @@ static const talk_base::SocketAddress kStunAddr("44.44.44.44", 4444);
 static const talk_base::SocketAddress kRelayAddr("55.55.55.55", 5555);
 static const talk_base::SocketAddress kProxyAddr("66.66.66.66", 6666);
 static const talk_base::ProxyType kProxyType = talk_base::PROXY_HTTPS;
-static const char kChannelName[] = "rtp_test";
-static const int kComponent = 1;
 static const char kRelayHost[] = "relay.google.com";
 static const char kRelayToken[] =
     "CAESFwoOb2phQGdvb2dsZS5jb20Q043h47MmGhBTB1rbfIXkhuarDCZe+xF6";