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

Unified Diff: content/browser/devtools/protocol/tethering_handler.cc

Issue 1874893002: Convert //content/browser from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/devtools/protocol/tethering_handler.cc
diff --git a/content/browser/devtools/protocol/tethering_handler.cc b/content/browser/devtools/protocol/tethering_handler.cc
index 1718261c355e64812e6047937effc232c6e5121b..5d07f60a9ace5ca5485e42187b391030222c77aa 100644
--- a/content/browser/devtools/protocol/tethering_handler.cc
+++ b/content/browser/devtools/protocol/tethering_handler.cc
@@ -27,7 +27,7 @@ const int kMaxTetheringPort = 32767;
using Response = DevToolsProtocolClient::Response;
using CreateServerSocketCallback =
- base::Callback<scoped_ptr<net::ServerSocket>(std::string*)>;
+ base::Callback<std::unique_ptr<net::ServerSocket>(std::string*)>;
class SocketPump {
public:
@@ -146,9 +146,9 @@ class SocketPump {
private:
- scoped_ptr<net::StreamSocket> client_socket_;
- scoped_ptr<net::ServerSocket> server_socket_;
- scoped_ptr<net::StreamSocket> accepted_socket_;
+ std::unique_ptr<net::StreamSocket> client_socket_;
+ std::unique_ptr<net::ServerSocket> server_socket_;
+ std::unique_ptr<net::StreamSocket> accepted_socket_;
int pending_writes_;
bool pending_destruction_;
};
@@ -217,8 +217,8 @@ class BoundSocket {
AcceptedCallback accepted_callback_;
CreateServerSocketCallback socket_callback_;
- scoped_ptr<net::ServerSocket> socket_;
- scoped_ptr<net::StreamSocket> accept_socket_;
+ std::unique_ptr<net::ServerSocket> socket_;
+ std::unique_ptr<net::StreamSocket> accept_socket_;
uint16_t port_;
};
@@ -268,7 +268,7 @@ void TetheringHandler::TetheringImpl::Bind(DevToolsCommandId command_id,
BoundSocket::AcceptedCallback callback = base::Bind(
&TetheringHandler::TetheringImpl::Accepted, base::Unretained(this));
- scoped_ptr<BoundSocket> bound_socket(
+ std::unique_ptr<BoundSocket> bound_socket(
new BoundSocket(callback, socket_callback_));
if (!bound_socket->Listen(port)) {
SendInternalError(command_id, "Could not bind port");
@@ -338,7 +338,7 @@ TetheringHandler::~TetheringHandler() {
}
}
-void TetheringHandler::SetClient(scoped_ptr<Client> client) {
+void TetheringHandler::SetClient(std::unique_ptr<Client> client) {
client_.swap(client);
}
« no previous file with comments | « content/browser/devtools/protocol/tethering_handler.h ('k') | content/browser/devtools/protocol/tracing_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698