Convert Pass()→std::move() in //net
BUG=557422
[email protected]
[email protected]
Review URL: https://codereview.chromium.org/1545233002
Cr-Commit-Position: refs/heads/master@{#366889}
diff --git a/net/server/web_socket_encoder.cc b/net/server/web_socket_encoder.cc
index 40d82410..6d59713d 100644
--- a/net/server/web_socket_encoder.cc
+++ b/net/server/web_socket_encoder.cc
@@ -4,6 +4,7 @@
#include "net/server/web_socket_encoder.h"
+#include <utility>
#include <vector>
#include "base/logging.h"
@@ -226,8 +227,8 @@
continue;
}
*deflate_parameters = response;
- return make_scoped_ptr(
- new WebSocketEncoder(FOR_SERVER, deflater.Pass(), inflater.Pass()));
+ return make_scoped_ptr(new WebSocketEncoder(FOR_SERVER, std::move(deflater),
+ std::move(inflater)));
}
// We cannot find an acceptable offer.
@@ -272,14 +273,16 @@
return make_scoped_ptr(new WebSocketEncoder(FOR_CLIENT, nullptr, nullptr));
}
- return make_scoped_ptr(
- new WebSocketEncoder(FOR_CLIENT, deflater.Pass(), inflater.Pass()));
+ return make_scoped_ptr(new WebSocketEncoder(FOR_CLIENT, std::move(deflater),
+ std::move(inflater)));
}
WebSocketEncoder::WebSocketEncoder(Type type,
scoped_ptr<WebSocketDeflater> deflater,
scoped_ptr<WebSocketInflater> inflater)
- : type_(type), deflater_(deflater.Pass()), inflater_(inflater.Pass()) {}
+ : type_(type),
+ deflater_(std::move(deflater)),
+ inflater_(std::move(inflater)) {}
WebSocketEncoder::~WebSocketEncoder() {}
