google_apis: Add GetURL() to 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 57 matching lines @@
   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;
   }
 
-  // Provides URL to the server which is useful when general purpose provider
-  // is registered.
-  GURL GetBaseURL();
+  // 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;
+
+  // 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|. Should be used if any custom data, such as additional
-  // headers should be send from the server.
-  GURL RegisterDefaultResponse(
+  // the |relative_path|, which should start with '/'. Should be used if any
+  // custom data, such as additional headers should be send from the server.

[hashimoto, 2012/11/16 05:38:10]

s/should be send/should be sent/

[satorux1, 2012/11/16 05:56:44]

Done.

+  void RegisterDefaultResponse(
       const std::string& relative_path,
       const HttpResponse& default_response);
 
   // Registers a simple text response.
-  GURL RegisterTextResponse(
+  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.
-  GURL RegisterFileResponse(
+  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();
 
@@ skipping 28 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_