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

Unified Diff: net/base/network_interfaces_win.cc

Issue 1752233002: Convert Pass()→std::move() on Windows (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/base/file_stream_context_win.cc ('k') | net/disk_cache/blockfile/file_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/network_interfaces_win.cc
diff --git a/net/base/network_interfaces_win.cc b/net/base/network_interfaces_win.cc
index fd119942261f0ef8ad98f85fa711b99fe5f45924..d64fd98f6efc8e94cde6d8fa98bbff4b129f281b 100644
--- a/net/base/network_interfaces_win.cc
+++ b/net/base/network_interfaces_win.cc
@@ -54,20 +54,20 @@ GetConnectionAttributes() {
scoped_ptr<WLAN_CONNECTION_ATTRIBUTES, internal::WlanApiDeleter>
wlan_connection_attributes;
if (!wlanapi.initialized)
- return wlan_connection_attributes.Pass();
+ return wlan_connection_attributes;
internal::WlanHandle client;
DWORD cur_version = 0;
const DWORD kMaxClientVersion = 2;
DWORD result = wlanapi.OpenHandle(kMaxClientVersion, &cur_version, &client);
if (result != ERROR_SUCCESS)
- return wlan_connection_attributes.Pass();
+ return wlan_connection_attributes;
WLAN_INTERFACE_INFO_LIST* interface_list_ptr = NULL;
result =
wlanapi.enum_interfaces_func(client.Get(), NULL, &interface_list_ptr);
if (result != ERROR_SUCCESS)
- return wlan_connection_attributes.Pass();
+ return wlan_connection_attributes;
scoped_ptr<WLAN_INTERFACE_INFO_LIST, internal::WlanApiDeleter> interface_list(
interface_list_ptr);
@@ -82,7 +82,7 @@ GetConnectionAttributes() {
}
if (info == NULL)
- return wlan_connection_attributes.Pass();
+ return wlan_connection_attributes;
WLAN_CONNECTION_ATTRIBUTES* conn_info_ptr = nullptr;
DWORD conn_info_size = 0;
@@ -96,7 +96,7 @@ GetConnectionAttributes() {
DCHECK(conn_info_ptr);
else
wlan_connection_attributes.reset();
- return wlan_connection_attributes.Pass();
+ return wlan_connection_attributes;
}
} // namespace
« no previous file with comments | « net/base/file_stream_context_win.cc ('k') | net/disk_cache/blockfile/file_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698