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 f9978aeefaa398c574814516a73de878804f6aaa..18798d3eeebfe85eb2583514a23e0c4ceb20e4af 100644 |
--- a/chrome/browser/google_apis/test_server/http_server.cc |
+++ b/chrome/browser/google_apis/test_server/http_server.cc |
@@ -7,6 +7,7 @@ |
#include "base/bind.h" |
#include "base/file_util.h" |
#include "base/stl_util.h" |
+#include "base/string_util.h" |
#include "base/stringprintf.h" |
#include "chrome/browser/google_apis/test_server/http_request.h" |
#include "chrome/browser/google_apis/test_server/http_response.h" |
@@ -146,19 +147,25 @@ void HttpServer::HandleRequest(HttpConnection* connection, |
delete connection; |
} |
-GURL HttpServer::GetBaseURL() { |
+GURL HttpServer::GetBaseURL() const { |
return base_url_; |
} |
+GURL HttpServer::GetURL(const std::string& relative_url) const { |
+ DCHECK(StartsWithASCII(relative_url, "/", true)); |
hashimoto
2012/11/16 05:38:10
Please add describe that 'true' means case sensiti
satorux1
2012/11/16 05:56:44
Done. boolean parameters like this are evil...
|
+ return base_url_.Resolve(relative_url); |
+} |
+ |
void HttpServer::RegisterRequestHandler( |
const HandleRequestCallback& callback) { |
request_handlers_.push_back(callback); |
} |
-GURL HttpServer::RegisterDefaultResponse( |
+void HttpServer::RegisterDefaultResponse( |
const std::string& relative_path, |
const HttpResponse& default_response) { |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
+ DCHECK(StartsWithASCII(relative_path, "/", true)); |
GURL request_url = base_url_.Resolve(relative_path); |
const HandleRequestCallback callback = |
@@ -166,31 +173,31 @@ GURL HttpServer::RegisterDefaultResponse( |
request_url, |
default_response); |
request_handlers_.push_back(callback); |
- |
- return request_url; |
} |
-GURL HttpServer::RegisterTextResponse( |
+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)); |
HttpResponse default_response; |
default_response.set_content(content); |
default_response.set_content_type(content_type); |
default_response.set_code(response_code); |
- return RegisterDefaultResponse(relative_path, default_response); |
+ RegisterDefaultResponse(relative_path, default_response); |
} |
-GURL HttpServer::RegisterFileResponse( |
+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)); |
HttpResponse default_response; |
@@ -203,7 +210,7 @@ GURL HttpServer::RegisterFileResponse( |
default_response.set_content_type(content_type); |
default_response.set_code(response_code); |
- return RegisterDefaultResponse(relative_path, default_response); |
+ RegisterDefaultResponse(relative_path, default_response); |
} |
void HttpServer::DidAccept(net::StreamListenSocket* server, |