google_apis: Add GetURL() to test_server::HttpServer

chrome/browser/google_apis/test_server/http_server.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/google_apis/test_server/http_server.h"
 
 #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"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_utils.h"
 #include "net/tools/fetch/http_listen_socket.h"
 
 namespace google_apis {
 namespace test_server {
 
@@ skipping 119 matching lines @@
   scoped_ptr<HttpResponse> not_found_response(new HttpResponse());
   not_found_response->set_code(NOT_FOUND);
   connection->SendResponse(not_found_response.Pass());
 
   // Drop the connection, since we do not support multiple requests per
   // connection.
   connections_.erase(connection->socket_.get());
   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 sensitive by comments or adding a
variable.
The same goes for other places.

[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 =
       base::Bind(&HandleDefaultRequest,
                  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;
 
   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);
 
-  return RegisterDefaultResponse(relative_path, default_response);
+  RegisterDefaultResponse(relative_path, default_response);
 }
 
 void HttpServer::DidAccept(net::StreamListenSocket* server,
                            net::StreamListenSocket* connection) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   HttpConnection* http_connection = new HttpConnection(
       connection,
       base::Bind(&HttpServer::HandleRequest, weak_factory_.GetWeakPtr()));
   connections_[connection] = http_connection;
@@ skipping 31 matching lines @@
   std::map<net::StreamListenSocket*, HttpConnection*>::iterator it =
       connections_.find(socket);
   if (it == connections_.end()) {
     return NULL;
   }
   return it->second;
 }
 
 }  // namespace test_server
 }  // namespace google_apis