| Index: chrome/browser/devtools/device/android_device_manager.cc
|
| diff --git a/chrome/browser/devtools/device/android_device_manager.cc b/chrome/browser/devtools/device/android_device_manager.cc
|
| index 1a97d1815985135e767c9d529f190e3b0ca75847..7b647ef81b80d19da8b6797e7cecaa0beac40cc0 100644
|
| --- a/chrome/browser/devtools/device/android_device_manager.cc
|
| +++ b/chrome/browser/devtools/device/android_device_manager.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include <stddef.h>
|
| #include <string.h>
|
| +#include <utility>
|
|
|
| #include "base/location.h"
|
| #include "base/strings/string_number_conversions.h"
|
| @@ -77,7 +78,7 @@ class HttpRequest {
|
| callback.Run(result, std::string());
|
| return;
|
| }
|
| - new HttpRequest(socket.Pass(), request, callback);
|
| + new HttpRequest(std::move(socket), request, callback);
|
| }
|
|
|
| static void HttpUpgradeRequest(const std::string& request,
|
| @@ -90,14 +91,14 @@ class HttpRequest {
|
| make_scoped_ptr<net::StreamSocket>(nullptr));
|
| return;
|
| }
|
| - new HttpRequest(socket.Pass(), request, callback);
|
| + new HttpRequest(std::move(socket), request, callback);
|
| }
|
|
|
| private:
|
| HttpRequest(scoped_ptr<net::StreamSocket> socket,
|
| const std::string& request,
|
| const CommandCallback& callback)
|
| - : socket_(socket.Pass()),
|
| + : socket_(std::move(socket)),
|
| command_callback_(callback),
|
| expected_size_(-1),
|
| header_size_(0) {
|
| @@ -107,10 +108,10 @@ class HttpRequest {
|
| HttpRequest(scoped_ptr<net::StreamSocket> socket,
|
| const std::string& request,
|
| const HttpUpgradeCallback& callback)
|
| - : socket_(socket.Pass()),
|
| - http_upgrade_callback_(callback),
|
| - expected_size_(-1),
|
| - header_size_(0) {
|
| + : socket_(std::move(socket)),
|
| + http_upgrade_callback_(callback),
|
| + expected_size_(-1),
|
| + header_size_(0) {
|
| SendRequest(request);
|
| }
|
|
|
| @@ -199,7 +200,8 @@ class HttpRequest {
|
| } else {
|
| // Pass the WebSocket frames (in |body|), too.
|
| http_upgrade_callback_.Run(net::OK,
|
| - ExtractHeader("Sec-WebSocket-Extensions:"), body, socket_.Pass());
|
| + ExtractHeader("Sec-WebSocket-Extensions:"),
|
| + body, std::move(socket_));
|
| }
|
| delete this;
|
| return;
|
|
|