webserver: Replace scoped_ptr with std::unique_ptr in request handlers
Now that we can use std::unique_ptr with base::Callback, remove the
remaining scoped_ptr usage in webserver's request handlers.
BUG=None
TEST=`FEATURES=test emerge-link webserver privetd leaderd`
CQ-DEPEND=CL:267720,CL:*214525
Change-Id: I7a05ce818bccfb2408eb624760a14a2c71da2c6e
Reviewed-on: https://chromium-review.googlesource.com/267284
Tested-by: Alex Vakulenko <avakulenko@chromium.org>
Trybot-Ready: Alex Vakulenko <avakulenko@chromium.org>
Reviewed-by: Christopher Wiley <wiley@chromium.org>
Commit-Queue: Alex Vakulenko <avakulenko@chromium.org>
diff --git a/libwebserv/protocol_handler.cc b/libwebserv/protocol_handler.cc
index fe0c9b0..6b0ec77 100644
--- a/libwebserv/protocol_handler.cc
+++ b/libwebserv/protocol_handler.cc
@@ -189,8 +189,8 @@
return false;
}
handler_iter->second.handler->HandleRequest(
- scoped_ptr<Request>(request.release()),
- scoped_ptr<Response>(new Response{this, request_id}));
+ std::move(request),
+ std::unique_ptr<Response>{new Response{this, request_id}});
return true;
}
diff --git a/libwebserv/request.h b/libwebserv/request.h
index f75622b..894546b 100644
--- a/libwebserv/request.h
+++ b/libwebserv/request.h
@@ -14,7 +14,6 @@
#include <base/callback_forward.h>
#include <base/macros.h>
#include <base/memory/ref_counted.h>
-#include <base/memory/scoped_ptr.h>
#include <chromeos/errors/error.h>
#include <libwebserv/export.h>
diff --git a/libwebserv/request_handler_callback.cc b/libwebserv/request_handler_callback.cc
index f5be1fb..4989a8e 100644
--- a/libwebserv/request_handler_callback.cc
+++ b/libwebserv/request_handler_callback.cc
@@ -10,9 +10,9 @@
const base::Callback<HandlerSignature>& callback) : callback_(callback) {
}
-void RequestHandlerCallback::HandleRequest(scoped_ptr<Request> request,
- scoped_ptr<Response> response) {
- callback_.Run(request.Pass(), response.Pass());
+void RequestHandlerCallback::HandleRequest(std::unique_ptr<Request> request,
+ std::unique_ptr<Response> response) {
+ callback_.Run(std::move(request), std::move(response));
}
} // namespace libwebserv
diff --git a/libwebserv/request_handler_callback.h b/libwebserv/request_handler_callback.h
index 1be1817..dd35a6e 100644
--- a/libwebserv/request_handler_callback.h
+++ b/libwebserv/request_handler_callback.h
@@ -21,8 +21,8 @@
explicit RequestHandlerCallback(
const base::Callback<HandlerSignature>& callback);
- void HandleRequest(scoped_ptr<Request> request,
- scoped_ptr<Response> response) override;
+ void HandleRequest(std::unique_ptr<Request> request,
+ std::unique_ptr<Response> response) override;
private:
base::Callback<HandlerSignature> callback_;
diff --git a/libwebserv/request_handler_interface.h b/libwebserv/request_handler_interface.h
index 0b12126..878c975 100644
--- a/libwebserv/request_handler_interface.h
+++ b/libwebserv/request_handler_interface.h
@@ -5,7 +5,8 @@
#ifndef WEBSERVER_LIBWEBSERV_REQUEST_HANDLER_INTERFACE_H_
#define WEBSERVER_LIBWEBSERV_REQUEST_HANDLER_INTERFACE_H_
-#include <base/memory/scoped_ptr.h>
+#include <memory>
+
#include <libwebserv/request.h>
#include <libwebserv/response.h>
@@ -17,10 +18,11 @@
// send response.
class RequestHandlerInterface {
public:
- using HandlerSignature = void(scoped_ptr<Request>, scoped_ptr<Response>);
+ using HandlerSignature =
+ void(std::unique_ptr<Request>, std::unique_ptr<Response>);
- virtual void HandleRequest(scoped_ptr<Request> request,
- scoped_ptr<Response> response) = 0;
+ virtual void HandleRequest(std::unique_ptr<Request> request,
+ std::unique_ptr<Response> response) = 0;
};
} // namespace libwebserv