Roll libjingle to r124. Removed overrides for the ws2 fixes.

Roll webrtc to 1888.

BUG=115702,117252
TEST=apprtc.appspot.com on windows and linux
Review URL: https://chromiumcodereview.appspot.com/9600066

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

6 files changed, 15 insertions, 5 deletions

diff --git a/remoting/jingle_glue/xmpp_socket_adapter.cc b/remoting/jingle_glue/xmpp_socket_adapter.cc
index e819736..611d70f 100644
--- a/remoting/jingle_glue/xmpp_socket_adapter.cc
+++ b/remoting/jingle_glue/xmpp_socket_adapter.cc
@@ -9,8 +9,8 @@
 
 #include "base/logging.h"
 #include "remoting/jingle_glue/ssl_adapter.h"
-#include "third_party/libjingle/overrides/talk/base/byteorder.h"
 #include "third_party/libjingle/overrides/talk/base/thread.h"
+#include "third_party/libjingle/source/talk/base/byteorder.h"
 #include "third_party/libjingle/source/talk/base/common.h"
 #include "third_party/libjingle/source/talk/base/firewallsocketserver.h"
 #include "third_party/libjingle/source/talk/base/socketadapters.h"
diff --git a/remoting/protocol/content_description.cc b/remoting/protocol/content_description.cc
index e2e3a9e..06fd309 100644
--- a/remoting/protocol/content_description.cc
+++ b/remoting/protocol/content_description.cc
@@ -159,6 +159,14 @@ ContentDescription::ContentDescription(
 
 ContentDescription::~ContentDescription() { }
 
+ContentDescription* ContentDescription::Copy() const {
+  if (!candidate_config_.get() || !authenticator_message_.get()) {
+    return NULL;
+  }
+  scoped_ptr<XmlElement> message(new XmlElement(*authenticator_message_));
+  return new ContentDescription(candidate_config_->Clone(), message.Pass());
+}
+
 // ToXml() creates content description for chromoting session. The
 // description looks as follows:
 //   <description xmlns="google:remoting">
diff --git a/remoting/protocol/content_description.h b/remoting/protocol/content_description.h
index cc66ac5..2eed505 100644
--- a/remoting/protocol/content_description.h
+++ b/remoting/protocol/content_description.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -32,6 +32,8 @@ class ContentDescription : public cricket::ContentDescription {
                      scoped_ptr<buzz::XmlElement> authenticator_message);
   virtual ~ContentDescription();
 
+  virtual ContentDescription* Copy() const OVERRIDE;
+
   const CandidateSessionConfig* config() const {
     return candidate_config_.get();
   }
diff --git a/remoting/protocol/message_decoder.cc b/remoting/protocol/message_decoder.cc
index ba9c5c1..6a102a3 100644
--- a/remoting/protocol/message_decoder.cc
+++ b/remoting/protocol/message_decoder.cc
@@ -8,7 +8,7 @@
 #include "net/base/io_buffer.h"
 #include "remoting/base/compound_buffer.h"
 #include "remoting/proto/internal.pb.h"
-#include "third_party/libjingle/overrides/talk/base/byteorder.h"
+#include "third_party/libjingle/source/talk/base/byteorder.h"
 
 namespace remoting {
 namespace protocol {
diff --git a/remoting/protocol/rtp_utils.cc b/remoting/protocol/rtp_utils.cc
index 8643827..92b6d67 100644
--- a/remoting/protocol/rtp_utils.cc
+++ b/remoting/protocol/rtp_utils.cc
@@ -5,7 +5,7 @@
 #include "remoting/protocol/rtp_utils.h"
 
 #include "base/logging.h"
-#include "third_party/libjingle/overrides/talk/base/byteorder.h"
+#include "third_party/libjingle/source/talk/base/byteorder.h"
 
 using talk_base::GetBE16;
 using talk_base::GetBE32;
diff --git a/remoting/protocol/util.cc b/remoting/protocol/util.cc
index 95ec04f..7b2ffe1 100644
--- a/remoting/protocol/util.cc
+++ b/remoting/protocol/util.cc
@@ -8,7 +8,7 @@
 #include "base/hash_tables.h"
 #include "base/logging.h"
 #include "net/base/io_buffer.h"
-#include "third_party/libjingle/overrides/talk/base/byteorder.h"
+#include "third_party/libjingle/source/talk/base/byteorder.h"
 
 namespace {