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

Unified Diff: chrome/browser/google_apis/test_server/http_server.cc

Issue 11419283: google_apis: Remove some functions from test_server::HttpServer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address comments Created 8 years 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: chrome/browser/google_apis/test_server/http_server.cc
diff --git a/chrome/browser/google_apis/test_server/http_server.cc b/chrome/browser/google_apis/test_server/http_server.cc
index 71efd95aeb16beca1bbea425f24d8896a4982562..803acb6d1682996f175b0c438e2c2ec854514203 100644
--- a/chrome/browser/google_apis/test_server/http_server.cc
+++ b/chrome/browser/google_apis/test_server/http_server.cc
@@ -164,60 +164,6 @@ void HttpServer::RegisterRequestHandler(
request_handlers_.push_back(callback);
}
-void HttpServer::RegisterDefaultResponse(
- const std::string& relative_path,
- const HttpResponse& default_response) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- DCHECK(StartsWithASCII(relative_path, "/", true /* case_sensitive */))
- << relative_path;
-
- const HandleRequestCallback callback =
- base::Bind(&HandleDefaultRequest,
- GetURL(relative_path),
- default_response);
- request_handlers_.push_back(callback);
-}
-
-void HttpServer::RegisterTextResponse(
- const std::string& relative_path,
- const std::string& content,
- const std::string& content_type,
- const ResponseCode response_code) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- DCHECK(StartsWithASCII(relative_path, "/", true /* case_sensitive */))
- << relative_path;
-
- HttpResponse default_response;
- default_response.set_content(content);
- default_response.set_content_type(content_type);
- default_response.set_code(response_code);
-
- RegisterDefaultResponse(relative_path, default_response);
-}
-
-void HttpServer::RegisterFileResponse(
- const std::string& relative_path,
- const FilePath& file_path,
- const std::string& content_type,
- const ResponseCode response_code) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- DCHECK(StartsWithASCII(relative_path, "/", true /* case_sensitive */))
- << relative_path;
-
- HttpResponse default_response;
-
- std::string content;
- const bool success = file_util::ReadFileToString(
- file_path, &content);
- default_response.set_content(content);
- DCHECK(success) << "Failed to open the file: " << file_path.value();
-
- default_response.set_content_type(content_type);
- default_response.set_code(response_code);
-
- RegisterDefaultResponse(relative_path, default_response);
-}
-
void HttpServer::DidAccept(net::StreamListenSocket* server,
net::StreamListenSocket* connection) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));

Powered by Google App Engine
This is Rietveld 408576698