Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(112)

Side by Side Diff: jingle/glue/channel_socket_adapter.cc

Issue 653203005: Roll WebRTC 7546:7549. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Decreased the number of gyp changes in this patch since thats the only major change (the reset is j… Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/renderer/p2p/port_allocator.h ('k') | jingle/glue/channel_socket_adapter_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "jingle/glue/channel_socket_adapter.h" 5 #include "jingle/glue/channel_socket_adapter.h"
6 6
7 #include <limits> 7 #include <limits>
8 8
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/message_loop/message_loop.h" 11 #include "base/message_loop/message_loop.h"
12 #include "net/base/io_buffer.h" 12 #include "net/base/io_buffer.h"
13 #include "net/base/net_errors.h" 13 #include "net/base/net_errors.h"
14 #include "third_party/libjingle/source/talk/p2p/base/transportchannel.h" 14 #include "third_party/webrtc/p2p/base/transportchannel.h"
15 15
16 namespace jingle_glue { 16 namespace jingle_glue {
17 17
18 TransportChannelSocketAdapter::TransportChannelSocketAdapter( 18 TransportChannelSocketAdapter::TransportChannelSocketAdapter(
19 cricket::TransportChannel* channel) 19 cricket::TransportChannel* channel)
20 : message_loop_(base::MessageLoop::current()), 20 : message_loop_(base::MessageLoop::current()),
21 channel_(channel), 21 channel_(channel),
22 closed_error_code_(net::OK) { 22 closed_error_code_(net::OK) {
23 DCHECK(channel_); 23 DCHECK(channel_);
24 24
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 } 191 }
192 192
193 void TransportChannelSocketAdapter::OnChannelDestroyed( 193 void TransportChannelSocketAdapter::OnChannelDestroyed(
194 cricket::TransportChannel* channel) { 194 cricket::TransportChannel* channel) {
195 DCHECK_EQ(base::MessageLoop::current(), message_loop_); 195 DCHECK_EQ(base::MessageLoop::current(), message_loop_);
196 DCHECK_EQ(channel, channel_); 196 DCHECK_EQ(channel, channel_);
197 Close(net::ERR_CONNECTION_ABORTED); 197 Close(net::ERR_CONNECTION_ABORTED);
198 } 198 }
199 199
200 } // namespace jingle_glue 200 } // namespace jingle_glue
OLDNEW
« no previous file with comments | « content/renderer/p2p/port_allocator.h ('k') | jingle/glue/channel_socket_adapter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698