google_apis: Remove some functions from test_server::HttpServer

chrome/browser/google_apis/test_server/http_server.h

 // 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.
 
 #ifndef CHROME_BROWSER_GOOGLE_APIS_TEST_SERVER_HTTP_SERVER_H_
 #define CHROME_BROWSER_GOOGLE_APIS_TEST_SERVER_HTTP_SERVER_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 10 matching lines @@
 
 // This class is required to be able to have composition instead of inheritance,
 class HttpListenSocket: public net::TCPListenSocket {
  public:
   HttpListenSocket(const SocketDescriptor socket_descriptor,
                    net::StreamListenSocket::Delegate* delegate);
   virtual void Listen();
 
  private:
   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.
 //
 // 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_server::HttpResponse>.

Did you really mean to return here? Or the type should be changed from void?

+// }
+//
 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)>
       HandleRequestCallback;
 
   // Creates a http test server. InitializeAndWaitUntilReady() must be called

[tfarina, 2013/01/19 18:34:30]

s/a/an?

   // to start the server.
   HttpServer();
   virtual ~HttpServer();
 
   // Initializes and waits until the server is ready to accept requests.
   bool InitializeAndWaitUntilReady();
 
   // Shuts down the http server and waits until the shutdown is complete.
   void ShutdownAndWaitUntilComplete();
 
   // Checks if the server is started.
   bool Started() const {
     return listen_socket_.get() != NULL;
   }
 
   // Returns the base URL to the server, which looks like
   // http://127.0.0.1:<port>/, where <port> is the actual port number used by
   // the server.
   GURL GetBaseURL() const;

[tfarina, 2013/01/19 18:34:30]

this can be just:

const GURL& base_url() const { return base_url_; }

 
   // Returns a URL to the server based on the given relative URL, which
   // should start with '/'. For example: GetURL("/path?query=foo") =>
   // http://127.0.0.1:<port>/path?query=foo.
   GURL GetURL(const std::string& relative_url) const;
 
   // Returns the port number used by the server.
   int port() const { return port_; }
 
   // The most general purpose method. Any request processing can be added using
   // this method. Takes ownership of the object. The |callback| is called
   // 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.
   void InitializeOnIOThread();
 
   // Shuts down the server.
   void ShutdownOnIOThread();
 
   // Handles a request when it is parsed. It passes the request to registed
   // request handlers and sends a http response.
   void HandleRequest(HttpConnection* connection,
                      scoped_ptr<HttpRequest> request);

[tfarina, 2013/01/19 18:34:30]

could we have passed this by const-ref?

 
   // net::StreamListenSocket::Delegate overrides:
   virtual void DidAccept(net::StreamListenSocket* server,
                          net::StreamListenSocket* connection) OVERRIDE;
   virtual void DidRead(net::StreamListenSocket* connection,
                        const char* data,
                        int length) OVERRIDE;
   virtual void DidClose(net::StreamListenSocket* connection) OVERRIDE;
 
   HttpConnection* FindConnection(net::StreamListenSocket* socket);
@@ skipping 11 matching lines @@
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<HttpServer> weak_factory_;
   DISALLOW_COPY_AND_ASSIGN(HttpServer);
 };
 
 }  // namespace test_servers
 }  // namespace google_apis
 
 #endif  // CHROME_BROWSER_GOOGLE_APIS_TEST_SERVER_HTTP_SERVER_H_