Commit f67c69f4 authored by Anna Malova's avatar Anna Malova Committed by Commit Bot

Convert EmbeddedTestServer to use BindRepeating.

Both RegisterRequestHandler and RegisterDefaultHandler expect
HandleRequestCallback which is RepeatingCallback.

Bug: 1007815
Change-Id: I4f7c9a970e6a1a767e3c21ccc65b5e98c027774a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2085313Reviewed-by: default avatarMatt Menke <mmenke@chromium.org>
Commit-Queue: Matt Menke <mmenke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#746834}
parent 6f1949a3
...@@ -120,7 +120,7 @@ void EmbeddedTestServerAndroid::RegisterRequestHandler( ...@@ -120,7 +120,7 @@ void EmbeddedTestServerAndroid::RegisterRequestHandler(
const JavaParamRef<jobject>& jobj, const JavaParamRef<jobject>& jobj,
jlong handler) { jlong handler) {
HandleRequestPtr handler_ptr = reinterpret_cast<HandleRequestPtr>(handler); HandleRequestPtr handler_ptr = reinterpret_cast<HandleRequestPtr>(handler);
test_server_.RegisterRequestHandler(base::Bind(handler_ptr)); test_server_.RegisterRequestHandler(base::BindRepeating(handler_ptr));
} }
void EmbeddedTestServerAndroid::ServeFilesFromDirectory( void EmbeddedTestServerAndroid::ServeFilesFromDirectory(
......
...@@ -495,7 +495,7 @@ scoped_refptr<X509Certificate> EmbeddedTestServer::GetCertificate() { ...@@ -495,7 +495,7 @@ scoped_refptr<X509Certificate> EmbeddedTestServer::GetCertificate() {
void EmbeddedTestServer::ServeFilesFromDirectory( void EmbeddedTestServer::ServeFilesFromDirectory(
const base::FilePath& directory) { const base::FilePath& directory) {
RegisterDefaultHandler(base::Bind(&HandleFileRequest, directory)); RegisterDefaultHandler(base::BindRepeating(&HandleFileRequest, directory));
} }
void EmbeddedTestServer::ServeFilesFromSourceDirectory( void EmbeddedTestServer::ServeFilesFromSourceDirectory(
...@@ -588,8 +588,9 @@ void EmbeddedTestServer::HandleAcceptResult( ...@@ -588,8 +588,9 @@ void EmbeddedTestServer::HandleAcceptResult(
std::unique_ptr<HttpConnection> http_connection_ptr = std::unique_ptr<HttpConnection> http_connection_ptr =
std::make_unique<HttpConnection>( std::make_unique<HttpConnection>(
std::move(socket), base::Bind(&EmbeddedTestServer::HandleRequest, std::move(socket),
base::Unretained(this))); base::BindRepeating(&EmbeddedTestServer::HandleRequest,
base::Unretained(this)));
HttpConnection* http_connection = http_connection_ptr.get(); HttpConnection* http_connection = http_connection_ptr.get();
connections_[http_connection->socket_.get()] = std::move(http_connection_ptr); connections_[http_connection->socket_.get()] = std::move(http_connection_ptr);
......
...@@ -53,7 +53,7 @@ struct HttpRequest; ...@@ -53,7 +53,7 @@ struct HttpRequest;
// void SetUp() { // void SetUp() {
// test_server_ = std::make_unique<EmbeddedTestServer>(); // test_server_ = std::make_unique<EmbeddedTestServer>();
// test_server_->RegisterRequestHandler( // test_server_->RegisterRequestHandler(
// base::Bind(&FooTest::HandleRequest, base::Unretained(this))); // base::BindRepeating(&FooTest::HandleRequest, base::Unretained(this)));
// ASSERT_TRUE((test_server_handle_ = test_server_.StartAndReturnHandle())); // ASSERT_TRUE((test_server_handle_ = test_server_.StartAndReturnHandle()));
// } // }
// //
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment