Roll libjingle to 98:99.

- Refactoring and bug fixes 
- Remove global variables of class type.

NOTE: I'm landing this for Ronghua since he's on leave.  The change has already been reviewed here: http://codereview.chromium.org/8790011/
but I had to create a new issue in order to resolve merge conflicts.



TBR=sergeyu

Review URL: http://codereview.chromium.org/8802019

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113086 0039d316-1c4b-4281-b951-d872f2087c98

DEPS

@@ -30,7 +30,7 @@ vars = {
       "40d182ac25fe6623cfbe5772623c15c663a42c93",
   "nacl_toolchain_revision": "7332",
 
-  "libjingle_revision": "95",
+  "libjingle_revision": "99",
   "libphonenumber_revision": "407",
   "libvpx_revision": "109236",
   "ffmpeg_revision": "112050",

content/renderer/p2p/ipc_network_manager.cc

@@ -53,7 +53,7 @@ void IpcNetworkManager::OnNetworkListChanged(
     memcpy(&address, &it->address[0], sizeof(uint32));
     address = ntohl(address);
     networks.push_back(
-        new talk_base::Network(it->name, it->name, address, 0));
+        new talk_base::Network(it->name, it->name, address));
   }
 
   MergeNetworkList(networks, !first_update_sent_);

jingle/glue/fake_network_manager.cc

@@ -20,7 +20,7 @@ FakeNetworkManager::FakeNetworkManager(const net::IPAddressNumber& address)
   talk_base::SocketAddress socket_address;
   CHECK(IPEndPointToSocketAddress(endpoint, &socket_address));
   network_.reset(new talk_base::Network("fake", "Fake Network",
-                                        socket_address.ip(), 0));
+                                        socket_address.ip()));
 }
 
 FakeNetworkManager::~FakeNetworkManager() {

jingle/notifier/base/notifier_options_util.cc

@@ -23,14 +23,14 @@ buzz::XmppClientSettings MakeXmppClientSettings(
   xmpp_client_settings.set_user(jid.node());
   xmpp_client_settings.set_resource("chrome-sync");
   xmpp_client_settings.set_host(jid.domain());
-  xmpp_client_settings.set_use_tls(true);
+  xmpp_client_settings.set_use_tls(buzz::TLS_ENABLED);
   xmpp_client_settings.set_auth_cookie(
       notifier_options.invalidate_xmpp_login ?
       token + "bogus" : token);
   xmpp_client_settings.set_token_service(token_service);
   if (notifier_options.allow_insecure_connection) {
     xmpp_client_settings.set_allow_plain(true);
-    xmpp_client_settings.set_use_tls(false);
+    xmpp_client_settings.set_use_tls(buzz::TLS_DISABLED);
   }
   return xmpp_client_settings;
 }

remoting/jingle_glue/xmpp_signal_strategy.cc

@@ -40,7 +40,7 @@ void XmppSignalStrategy::Init(StatusObserver* observer) {
   settings.set_user(login_jid.node());
   settings.set_host(login_jid.domain());
   settings.set_resource("chromoting");
-  settings.set_use_tls(true);
+  settings.set_use_tls(buzz::TLS_ENABLED);
   settings.set_token_service(auth_token_service_);
   settings.set_auth_cookie(auth_token_);
   settings.set_server(talk_base::SocketAddress("talk.google.com", 5222));

third_party/libjingle/README.chromium

@@ -1,12 +1,17 @@
-Name: libjingle
+Name: Libjingle library. Used for p2p voice and video communication.
+Short Name: libjingle
 URL: http://code.google.com/p/libjingle/
 Version: 2.7.0
+Revision: 99
 License: BSD
 License File: source/COPYING
+Security Critical: yes
 
 Description:
   Libjingle provides xmpp support to the sync code, which
   lives at chrome/browser/sync/notifier.
 
   Libjingle is distributed under a Berkeley-style license detailed in
   source/COPYING.
+
+Local Modifications:

third_party/libjingle/libjingle.gyp

@@ -207,6 +207,8 @@
         'source/talk/base/httpcommon.h',
         'source/talk/base/httprequest.cc',
         'source/talk/base/httprequest.h',
+        'source/talk/base/ipaddress.cc',
+        'source/talk/base/ipaddress.h',
         'source/talk/base/json.cc',
         'source/talk/base/json.h',
         'source/talk/base/linked_ptr.h',
@@ -469,6 +471,8 @@
         'source/talk/session/phone/cryptoparams.h',
         'source/talk/session/phone/currentspeakermonitor.cc',
         'source/talk/session/phone/currentspeakermonitor.h',
+        'source/talk/session/phone/devicemanager.cc',
+        'source/talk/session/phone/devicemanager.h',
         'source/talk/session/phone/dummydevicemanager.cc',
         'source/talk/session/phone/dummydevicemanager.h',
         'source/talk/session/phone/filemediaengine.cc',
@@ -495,6 +499,8 @@
         'source/talk/session/phone/soundclip.h',
         'source/talk/session/phone/srtpfilter.cc',
         'source/talk/session/phone/srtpfilter.h',
+        'source/talk/session/phone/ssrcmuxfilter.cc',
+        'source/talk/session/phone/ssrcmuxfilter.h',
         'source/talk/session/phone/videocapturer.cc',
         'source/talk/session/phone/videocapturer.h',
         'source/talk/session/phone/videocommon.cc',