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

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

Issue 1421903008: Revert of SSL in EmbeddedTestServer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « net/test/embedded_test_server/http_response.h ('k') | net/test/embedded_test_server/request_handler_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/test/embedded_test_server/http_response.cc
diff --git a/net/test/embedded_test_server/http_response.cc b/net/test/embedded_test_server/http_response.cc
index 51e75610a9d52f0351aa4a6dacf164f81f937e58..04155b5ffa529781480646dfa57f8a39caea081b 100644
--- a/net/test/embedded_test_server/http_response.cc
+++ b/net/test/embedded_test_server/http_response.cc
@@ -13,26 +13,6 @@
namespace test_server {
HttpResponse::~HttpResponse() {
-}
-
-RawHttpResponse::RawHttpResponse(const std::string& headers,
- const std::string& contents)
- : headers_(headers), contents_(contents) {}
-
-RawHttpResponse::~RawHttpResponse() {}
-
-void RawHttpResponse::SendResponse(const SendBytesCallback& send,
- const SendCompleteCallback& done) {
- std::string response;
- if (!headers_.empty())
- response = headers_ + "\r\n" + contents_;
- else
- response = contents_;
- send.Run(response, done);
-}
-
-void RawHttpResponse::AddHeader(const std::string& key_value_pair) {
- headers_.append(base::StringPrintf("%s\r\n", key_value_pair.c_str()));
}
BasicHttpResponse::BasicHttpResponse() : code_(HTTP_OK) {
@@ -53,10 +33,11 @@
code_,
http_reason_phrase.c_str());
base::StringAppendF(&response_builder, "Connection: close\r\n");
-
- base::StringAppendF(&response_builder, "Content-Length: %" PRIuS "\r\n",
+ base::StringAppendF(&response_builder,
+ "Content-Length: %" PRIuS "\r\n",
content_.size());
- base::StringAppendF(&response_builder, "Content-Type: %s\r\n",
+ base::StringAppendF(&response_builder,
+ "Content-Type: %s\r\n",
content_type_.c_str());
for (size_t i = 0; i < custom_headers_.size(); ++i) {
const std::string& header_name = custom_headers_[i].first;
@@ -73,10 +54,5 @@
return response_builder + content_;
}
-void BasicHttpResponse::SendResponse(const SendBytesCallback& send,
- const SendCompleteCallback& done) {
- send.Run(ToResponseString(), done);
-}
-
} // namespace test_server
} // namespace net
« no previous file with comments | « net/test/embedded_test_server/http_response.h ('k') | net/test/embedded_test_server/request_handler_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698