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

Side by Side Diff: net/udp/udp_socket_win.cc

Issue 1893083002: Change scoped_ptr to std::unique_ptr in //net. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptr-net-all: iwyu Created 4 years, 8 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
« no previous file with comments | « net/udp/udp_socket_win.h ('k') | no next file » | 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 "net/udp/udp_socket_win.h" 5 #include "net/udp/udp_socket_win.h"
6 6
7 #include <mstcpip.h> 7 #include <mstcpip.h>
8 8
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after
322 DCHECK(CalledOnValidThread()); 322 DCHECK(CalledOnValidThread());
323 DCHECK(address); 323 DCHECK(address);
324 if (!is_connected()) 324 if (!is_connected())
325 return ERR_SOCKET_NOT_CONNECTED; 325 return ERR_SOCKET_NOT_CONNECTED;
326 326
327 // TODO(szym): Simplify. http://crbug.com/126152 327 // TODO(szym): Simplify. http://crbug.com/126152
328 if (!remote_address_.get()) { 328 if (!remote_address_.get()) {
329 SockaddrStorage storage; 329 SockaddrStorage storage;
330 if (getpeername(socket_, storage.addr, &storage.addr_len)) 330 if (getpeername(socket_, storage.addr, &storage.addr_len))
331 return MapSystemError(WSAGetLastError()); 331 return MapSystemError(WSAGetLastError());
332 scoped_ptr<IPEndPoint> remote_address(new IPEndPoint()); 332 std::unique_ptr<IPEndPoint> remote_address(new IPEndPoint());
333 if (!remote_address->FromSockAddr(storage.addr, storage.addr_len)) 333 if (!remote_address->FromSockAddr(storage.addr, storage.addr_len))
334 return ERR_ADDRESS_INVALID; 334 return ERR_ADDRESS_INVALID;
335 remote_address_.reset(remote_address.release()); 335 remote_address_.reset(remote_address.release());
336 } 336 }
337 337
338 *address = *remote_address_; 338 *address = *remote_address_;
339 return OK; 339 return OK;
340 } 340 }
341 341
342 int UDPSocketWin::GetLocalAddress(IPEndPoint* address) const { 342 int UDPSocketWin::GetLocalAddress(IPEndPoint* address) const {
343 DCHECK(CalledOnValidThread()); 343 DCHECK(CalledOnValidThread());
344 DCHECK(address); 344 DCHECK(address);
345 if (!is_connected()) 345 if (!is_connected())
346 return ERR_SOCKET_NOT_CONNECTED; 346 return ERR_SOCKET_NOT_CONNECTED;
347 347
348 // TODO(szym): Simplify. http://crbug.com/126152 348 // TODO(szym): Simplify. http://crbug.com/126152
349 if (!local_address_.get()) { 349 if (!local_address_.get()) {
350 SockaddrStorage storage; 350 SockaddrStorage storage;
351 if (getsockname(socket_, storage.addr, &storage.addr_len)) 351 if (getsockname(socket_, storage.addr, &storage.addr_len))
352 return MapSystemError(WSAGetLastError()); 352 return MapSystemError(WSAGetLastError());
353 scoped_ptr<IPEndPoint> local_address(new IPEndPoint()); 353 std::unique_ptr<IPEndPoint> local_address(new IPEndPoint());
354 if (!local_address->FromSockAddr(storage.addr, storage.addr_len)) 354 if (!local_address->FromSockAddr(storage.addr, storage.addr_len))
355 return ERR_ADDRESS_INVALID; 355 return ERR_ADDRESS_INVALID;
356 local_address_.reset(local_address.release()); 356 local_address_.reset(local_address.release());
357 net_log_.AddEvent(NetLog::TYPE_UDP_LOCAL_ADDRESS, 357 net_log_.AddEvent(NetLog::TYPE_UDP_LOCAL_ADDRESS,
358 CreateNetLogUDPConnectCallback(local_address_.get())); 358 CreateNetLogUDPConnectCallback(local_address_.get()));
359 } 359 }
360 360
361 *address = *local_address_; 361 *address = *local_address_;
362 return OK; 362 return OK;
363 } 363 }
(...skipping 806 matching lines...) Expand 10 before | Expand all | Expand 10 after
1170 void UDPSocketWin::DetachFromThread() { 1170 void UDPSocketWin::DetachFromThread() {
1171 base::NonThreadSafe::DetachFromThread(); 1171 base::NonThreadSafe::DetachFromThread();
1172 } 1172 }
1173 1173
1174 void UDPSocketWin::UseNonBlockingIO() { 1174 void UDPSocketWin::UseNonBlockingIO() {
1175 DCHECK(!core_); 1175 DCHECK(!core_);
1176 use_non_blocking_io_ = true; 1176 use_non_blocking_io_ = true;
1177 } 1177 }
1178 1178
1179 } // namespace net 1179 } // namespace net
OLDNEW
« no previous file with comments | « net/udp/udp_socket_win.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698