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

Unified Diff: ios/web/public/test/http_server.mm

Issue 2128533002: Convert ScopedVector<T> to std::vector<std::unique_ptr<T>>. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 | « ios/web/public/test/http_server.h ('k') | ios/web/public/test/http_server_inttest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/web/public/test/http_server.mm
diff --git a/ios/web/public/test/http_server.mm b/ios/web/public/test/http_server.mm
index 4e3dede6c16696fac9fcfece697e73861d6ae748..e733a5f8b5c342f90dd3b2b7879daea26273aeb6 100644
--- a/ios/web/public/test/http_server.mm
+++ b/ios/web/public/test/http_server.mm
@@ -48,11 +48,9 @@ web::ResponseProvider::Request ResponseProviderRequestFromGCDWebServerRequest(
namespace web {
namespace test {
-
RefCountedResponseProviderWrapper::RefCountedResponseProviderWrapper(
- ResponseProvider* response_provider) {
- response_provider_.reset(response_provider);
-}
+ std::unique_ptr<ResponseProvider> response_provider)
+ : response_provider_(std::move(response_provider)) {}
RefCountedResponseProviderWrapper::~RefCountedResponseProviderWrapper() {}
@@ -68,12 +66,12 @@ HttpServer& HttpServer::GetSharedInstance() {
// static
HttpServer& HttpServer::GetSharedInstanceWithResponseProviders(
- const ProviderList& response_providers) {
+ ProviderList response_providers) {
DCHECK([NSThread isMainThread]);
HttpServer& server = HttpServer::GetSharedInstance();
- for (const auto& response_provider : response_providers) {
- server.AddResponseProvider(response_provider);
- }
+ // Use non-const reference as the response_provider ownership is transfered.
+ for (std::unique_ptr<ResponseProvider>& provider : response_providers)
+ server.AddResponseProvider(std::move(provider));
return server;
}
@@ -193,14 +191,15 @@ scoped_refptr<RefCountedResponseProviderWrapper>
return result;
}
-void HttpServer::AddResponseProvider(ResponseProvider* response_provider) {
+void HttpServer::AddResponseProvider(
+ std::unique_ptr<ResponseProvider> response_provider) {
DCHECK([NSThread isMainThread]);
DCHECK(IsRunning()) << "Can add a response provider only when the server is "
<< "running.";
base::AutoLock autolock(provider_list_lock_);
scoped_refptr<RefCountedResponseProviderWrapper>
ref_counted_response_provider(
- new RefCountedResponseProviderWrapper(response_provider));
+ new RefCountedResponseProviderWrapper(std::move(response_provider)));
providers_.push_back(ref_counted_response_provider);
}
« no previous file with comments | « ios/web/public/test/http_server.h ('k') | ios/web/public/test/http_server_inttest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698