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

Unified Diff: net/test/embedded_test_server/embedded_test_server.cc

Issue 657013003: Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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: net/test/embedded_test_server/embedded_test_server.cc
diff --git a/net/test/embedded_test_server/embedded_test_server.cc b/net/test/embedded_test_server/embedded_test_server.cc
index b266c55c899c26ee25a3addb1d92ab07dbca27e9..98f50b65ea3ce62acbe40ab179576f0f952e3f6d 100644
--- a/net/test/embedded_test_server/embedded_test_server.cc
+++ b/net/test/embedded_test_server/embedded_test_server.cc
@@ -73,13 +73,13 @@ scoped_ptr<HttpResponse> HandleFileRequest(
scoped_ptr<CustomHttpResponse> http_response(
new CustomHttpResponse(headers_contents, file_contents));
- return http_response.PassAs<HttpResponse>();
+ return http_response.Pass();
}
scoped_ptr<BasicHttpResponse> http_response(new BasicHttpResponse);
http_response->set_code(HTTP_OK);
http_response->set_content(file_contents);
- return http_response.PassAs<HttpResponse>();
+ return http_response.Pass();
}
} // namespace
@@ -243,8 +243,7 @@ void EmbeddedTestServer::HandleRequest(HttpConnection* connection,
<< request->relative_url;
scoped_ptr<BasicHttpResponse> not_found_response(new BasicHttpResponse);
not_found_response->set_code(HTTP_NOT_FOUND);
- connection->SendResponse(
- not_found_response.PassAs<HttpResponse>());
+ connection->SendResponse(not_found_response.Pass());
}
// Drop the connection, since we do not support multiple requests per
« no previous file with comments | « net/socket/unix_domain_listen_socket_posix.cc ('k') | net/test/embedded_test_server/embedded_test_server_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698