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

Unified Diff: net/socket/nss_ssl_util.cc

Issue 1586833002: Convert Pass()→std::move() for iOS build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert accidental //base change Created 4 years, 11 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/socket/client_socket_factory.cc ('k') | net/socket/ssl_client_socket_nss.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/nss_ssl_util.cc
diff --git a/net/socket/nss_ssl_util.cc b/net/socket/nss_ssl_util.cc
index 74b4d416d24153b8cd25d62f66f659bf3c2523ef..ee587571639dd1e29df928b754eba1e44d882531 100644
--- a/net/socket/nss_ssl_util.cc
+++ b/net/socket/nss_ssl_util.cc
@@ -11,6 +11,7 @@
#include <sslproto.h>
#include <string>
+#include <utility>
#include "base/bind.h"
#include "base/cpu.h"
@@ -87,7 +88,7 @@ scoped_ptr<base::Value> NetLogSSLErrorCallback(
dict->SetInteger("net_error", net_error);
if (ssl_lib_error)
dict->SetInteger("ssl_lib_error", ssl_lib_error);
- return dict.Pass();
+ return std::move(dict);
}
class NSSSSLInitSingleton {
@@ -388,7 +389,7 @@ scoped_ptr<base::Value> NetLogSSLFailedNSSFunctionCallback(
if (param[0] != '\0')
dict->SetString("param", param);
dict->SetInteger("ssl_lib_error", ssl_lib_error);
- return dict.Pass();
+ return std::move(dict);
}
void LogFailedNSSFunction(const BoundNetLog& net_log,
« no previous file with comments | « net/socket/client_socket_factory.cc ('k') | net/socket/ssl_client_socket_nss.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698