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

Side by Side Diff: webrtc/base/httpserver.cc

Issue 1803833002: Stop using some scoped_ptr features that unique_ptr doesn't have (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 9 months 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
OLDNEW
1 /* 1 /*
2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 } 261 }
262 262
263 void HttpListenServer::StopListening() { 263 void HttpListenServer::StopListening() {
264 if (listener_) { 264 if (listener_) {
265 listener_->Close(); 265 listener_->Close();
266 } 266 }
267 } 267 }
268 268
269 void HttpListenServer::OnReadEvent(AsyncSocket* socket) { 269 void HttpListenServer::OnReadEvent(AsyncSocket* socket) {
270 ASSERT(socket == listener_.get()); 270 ASSERT(socket == listener_.get());
271 ASSERT(listener_); 271 ASSERT(!!listener_);
tommi 2016/03/15 09:22:09 Not necessary
kwiberg-webrtc 2016/03/15 09:59:41 Done.
272 AsyncSocket* incoming = listener_->Accept(NULL); 272 AsyncSocket* incoming = listener_->Accept(NULL);
273 if (incoming) { 273 if (incoming) {
274 StreamInterface* stream = new SocketStream(incoming); 274 StreamInterface* stream = new SocketStream(incoming);
275 //stream = new LoggingAdapter(stream, LS_VERBOSE, "HttpServer", false); 275 //stream = new LoggingAdapter(stream, LS_VERBOSE, "HttpServer", false);
276 HandleConnection(stream); 276 HandleConnection(stream);
277 } 277 }
278 } 278 }
279 279
280 void HttpListenServer::OnConnectionClosed(HttpServer* server, 280 void HttpListenServer::OnConnectionClosed(HttpServer* server,
281 int connection_id, 281 int connection_id,
282 StreamInterface* stream) { 282 StreamInterface* stream) {
283 Thread::Current()->Dispose(stream); 283 Thread::Current()->Dispose(stream);
284 } 284 }
285 285
286 /////////////////////////////////////////////////////////////////////////////// 286 ///////////////////////////////////////////////////////////////////////////////
287 287
288 } // namespace rtc 288 } // namespace rtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698