summaryrefslogtreecommitdiffstats
path: root/jingle
diff options
context:
space:
mode:
authorronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-14 02:08:55 +0000
committerronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-14 02:08:55 +0000
commit4a13f9d5b03fd05b66204993e41b686afdca41dc (patch)
tree9a86a7908c540c33de9e822bf4f9d0cf434636a7 /jingle
parentf8edfc490c25300378778980406459e3a8d0be94 (diff)
downloadchromium_src-4a13f9d5b03fd05b66204993e41b686afdca41dc.zip
chromium_src-4a13f9d5b03fd05b66204993e41b686afdca41dc.tar.gz
chromium_src-4a13f9d5b03fd05b66204993e41b686afdca41dc.tar.bz2
Rolling libjingle to 159.
TEST=unit tests, webrtc pytest Review URL: https://chromiumcodereview.appspot.com/10689180 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146709 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle')
-rw-r--r--jingle/glue/channel_socket_adapter_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/jingle/glue/channel_socket_adapter_unittest.cc b/jingle/glue/channel_socket_adapter_unittest.cc
index 867aeea..6a51640 100644
--- a/jingle/glue/channel_socket_adapter_unittest.cc
+++ b/jingle/glue/channel_socket_adapter_unittest.cc
@@ -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.
@@ -30,7 +30,7 @@ const int kTestError = -32123;
class MockTransportChannel : public cricket::TransportChannel {
public:
MockTransportChannel()
- : cricket::TransportChannel(0) {
+ : cricket::TransportChannel("", 0) {
set_writable(true);
set_readable(true);
}