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

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

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
« no previous file with comments | « no previous file | chrome/browser/google_apis/test_server/http_server.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/google_apis/test_server/http_server.h
diff --git a/chrome/browser/google_apis/test_server/http_server.h b/chrome/browser/google_apis/test_server/http_server.h
index 2352402da74fe98286565e387d438bae961784e7..ac941e9e6698530f3b2565894779b6585132fc9f 100644
--- a/chrome/browser/google_apis/test_server/http_server.h
+++ b/chrome/browser/google_apis/test_server/http_server.h
@@ -30,7 +30,7 @@ class HttpListenSocket: public net::TCPListenSocket {
virtual ~HttpListenSocket();
};
tfarina 2013/01/19 18:34:30 nit: DISALLOW_COPY_AND_ASSGIN?
-// Class providing a HTTP server for testing purpose. This is a basic server
+// Class providing an HTTP server for testing purpose. This is a basic server
// providing only an essential subset of HTTP/1.1 protocol. Especially,
// it assumes that the request syntax is correct. It *does not* support
// a Chunked Transfer Encoding.
@@ -38,22 +38,27 @@ class HttpListenSocket: public net::TCPListenSocket {
// The common use case is below:
//
// scoped_ptr<HttpServer> test_server_;
-// GURL hello_world_url_;
-// GURL file_url_;
-// (...)
+//
// void SetUp() {
// test_server_.reset(new HttpServer());
// DCHECK(test_server_.InitializeAndWaitUntilReady());
-// hello_world_url = test_server->RegisterTextResponse(
-// "/abc",
-// "<b>Hello world!</b>",
-// "text/html");
-// metadata_url = test_server->RegisterFileResponse(
-// "metadata/file.doc")
-// "testing/data/metadata.xml",
-// "text/xml",
-// 200);
+// test_server->RegisterRequestHandler(
tfarina 2013/01/19 18:34:30 s/test_server->/test_server_->
+// base::Bind(&FooTest::HandleRequest, base::Unretained(this)));
+// }
+//
+// void HandleRequest(const HttpRequest& request) {
tfarina 2013/01/19 18:34:30 s/void/scoped_ptr<test_server::HttpResponse> ?
+// GURL absolute_url = test_server_.GetURL(request.relative_url);
tfarina 2013/01/19 18:34:30 s/test_server_./test_server_->
+// if (absolute_url.path() != "/test")
+// return scoped_ptr<test_server::HttpResponse>();
+//
+// scoped_ptr<test_server::HttpResponse> http_response(
+// new test_server::HttpResponse);
+// http_response->set_code(test_server::SUCCESS);
+// http_response->set_content("hello");
+// http_response->set_content_type("text/plain");
+// return http_response.Pass();
tfarina 2013/01/19 15:44:27 this function doesn't return scoped_ptr<test_serve
// }
+//
class HttpServer : private net::StreamListenSocket::Delegate {
tfarina 2013/01/19 18:34:30 does this needs to be private?
public:
typedef base::Callback<scoped_ptr<HttpResponse>(const HttpRequest& request)>
@@ -93,27 +98,6 @@ class HttpServer : private net::StreamListenSocket::Delegate {
// on UI thread.
void RegisterRequestHandler(const HandleRequestCallback& callback);
- // Used to provide the same predefined response for the requests matching
- // the |relative_path|, which should start with '/'. Should be used if any
- // custom data, such as additional headers should be sent from the server.
- void RegisterDefaultResponse(
- const std::string& relative_path,
- const HttpResponse& default_response);
-
- // Registers a simple text response.
- void RegisterTextResponse(
- const std::string& relative_path,
- const std::string& content,
- const std::string& content_type,
- const ResponseCode response_code);
-
- // Registers a simple file response. The file is loaded into memory.
- void RegisterFileResponse(
- const std::string& relative_path,
- const FilePath& file_path,
- const std::string& content_type,
- const ResponseCode response_code);
-
private:
// Initializes and starts the server. If initialization succeeds, Starts()
// will return true.
« no previous file with comments | « no previous file | chrome/browser/google_apis/test_server/http_server.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698