| 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 75b46e22166e6fb8aaaccddaf74e46dd863f3072..d6f2c252341bf72727c2353be7f68e8b562e0337 100644
|
| --- a/net/test/embedded_test_server/embedded_test_server.cc
|
| +++ b/net/test/embedded_test_server/embedded_test_server.cc
|
| @@ -29,8 +29,7 @@ namespace {
|
| class CustomHttpResponse : public HttpResponse {
|
| public:
|
| CustomHttpResponse(const std::string& headers, const std::string& contents)
|
| - : headers_(headers), contents_(contents) {
|
| - }
|
| + : headers_(headers), contents_(contents) {}
|
|
|
| virtual std::string ToResponseString() const OVERRIDE {
|
| return headers_ + "\r\n" + contents_;
|
| @@ -44,9 +43,8 @@ class CustomHttpResponse : public HttpResponse {
|
| };
|
|
|
| // Handles |request| by serving a file from under |server_root|.
|
| -scoped_ptr<HttpResponse> HandleFileRequest(
|
| - const base::FilePath& server_root,
|
| - const HttpRequest& request) {
|
| +scoped_ptr<HttpResponse> HandleFileRequest(const base::FilePath& server_root,
|
| + const HttpRequest& request) {
|
| // This is a test-only server. Ignore I/O thread restrictions.
|
| base::ThreadRestrictions::ScopedAllowIO allow_io;
|
|
|
| @@ -103,9 +101,7 @@ void HttpListenSocket::DetachFromThread() {
|
| thread_checker_.DetachFromThread();
|
| }
|
|
|
| -EmbeddedTestServer::EmbeddedTestServer()
|
| - : port_(-1),
|
| - weak_factory_(this) {
|
| +EmbeddedTestServer::EmbeddedTestServer() : port_(-1), weak_factory_(this) {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| }
|
|
|
| @@ -211,7 +207,7 @@ void EmbeddedTestServer::ShutdownOnIOThread() {
|
| }
|
|
|
| void EmbeddedTestServer::HandleRequest(HttpConnection* connection,
|
| - scoped_ptr<HttpRequest> request) {
|
| + scoped_ptr<HttpRequest> request) {
|
| DCHECK(io_thread_->message_loop_proxy()->BelongsToCurrentThread());
|
|
|
| bool request_handled = false;
|
| @@ -231,8 +227,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.PassAs<HttpResponse>());
|
| }
|
|
|
| // Drop the connection, since we do not support multiple requests per
|
| @@ -258,22 +253,21 @@ void EmbeddedTestServer::RegisterRequestHandler(
|
| request_handlers_.push_back(callback);
|
| }
|
|
|
| -void EmbeddedTestServer::DidAccept(
|
| - StreamListenSocket* server,
|
| - scoped_ptr<StreamListenSocket> connection) {
|
| +void EmbeddedTestServer::DidAccept(StreamListenSocket* server,
|
| + scoped_ptr<StreamListenSocket> connection) {
|
| DCHECK(io_thread_->message_loop_proxy()->BelongsToCurrentThread());
|
|
|
| - HttpConnection* http_connection = new HttpConnection(
|
| - connection.Pass(),
|
| - base::Bind(&EmbeddedTestServer::HandleRequest,
|
| - weak_factory_.GetWeakPtr()));
|
| + HttpConnection* http_connection =
|
| + new HttpConnection(connection.Pass(),
|
| + base::Bind(&EmbeddedTestServer::HandleRequest,
|
| + weak_factory_.GetWeakPtr()));
|
| // TODO(szym): Make HttpConnection the StreamListenSocket delegate.
|
| connections_[http_connection->socket_.get()] = http_connection;
|
| }
|
|
|
| void EmbeddedTestServer::DidRead(StreamListenSocket* connection,
|
| - const char* data,
|
| - int length) {
|
| + const char* data,
|
| + int length) {
|
| DCHECK(io_thread_->message_loop_proxy()->BelongsToCurrentThread());
|
|
|
| HttpConnection* http_connection = FindConnection(connection);
|
| @@ -296,8 +290,7 @@ void EmbeddedTestServer::DidClose(StreamListenSocket* connection) {
|
| connections_.erase(connection);
|
| }
|
|
|
| -HttpConnection* EmbeddedTestServer::FindConnection(
|
| - StreamListenSocket* socket) {
|
| +HttpConnection* EmbeddedTestServer::FindConnection(StreamListenSocket* socket) {
|
| DCHECK(io_thread_->message_loop_proxy()->BelongsToCurrentThread());
|
|
|
| std::map<StreamListenSocket*, HttpConnection*>::iterator it =
|
|
|