platform/testing/{URL|Unit}TestHelpers improvements

third_party/WebKit/Source/platform/testing/URLTestHelpers.h

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 15 matching lines @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef URLTestHelpers_h
 #define URLTestHelpers_h
 
 #include "platform/weborigin/KURL.h"
 #include "public/platform/WebString.h"
+#include "public/platform/WebURL.h"
 
 namespace blink {
 
-class WebURL;
 class WebURLResponse;
 
 namespace URLTestHelpers {
 
 inline blink::KURL toKURL(const std::string& url) {
   WTF::String wtfString(url.c_str());
   return blink::KURL(blink::ParsedURLString, wtfString);
 }
 
 // Helper functions for mock URLs. These functions set up the desired URL and
 // mimeType, with a 200 OK return status.
-// For the mock URL, fullURL == baseURL + fileName.
-// For the actual file path:
-// <WebKit root directory> + relativeBaseDirectory + fileName,
-// or, if the relative base directory is not specified:
-// <WebKit root directory> + fileName.
-//
-void registerMockedURLFromBaseURL(
+// webTestDataPath() or platformTestDataPath() in UnitTestHelpers can be used to
+// get the appropriate |basePath| and |filePath| for test data directories.
+//  - For the mock URL, fullURL == baseURL + fileName.
+//  - For the file path, filePath == basePath + ("/" +) fileName.
+
+// Registers from a base URL and a base file path, and returns a calculated full
+// URL.
+WebURL registerMockedURLLoadFromBase(
     const WebString& baseURL,
+    const WebString& basePath,
     const WebString& fileName,
     const WebString& mimeType = WebString::fromUTF8("text/html"));
+
+// Registers from a full URL and a full file path.
 void registerMockedURLLoad(
     const WebURL& fullURL,
-    const WebString& fileName,
+    const WebString& filePath,
     const WebString& mimeType = WebString::fromUTF8("text/html"));
-void registerMockedURLLoad(const WebURL& fullURL,
-                           const WebString& fileName,
-                           const WebString& relativeBaseDirectory,
-                           const WebString& mimeType);
-void registerMockedURLLoadWithCustomResponse(
-    const WebURL& fullURL,
-    const WebString& fileName,
-    const WebString& relativeBaseDirectory,
-    WebURLResponse);
+void registerMockedURLLoadWithCustomResponse(const WebURL& fullURL,
+                                             const WebString& filePath,
+                                             WebURLResponse);
+
+// Registers a mock URL that returns a 404 error.
 void registerMockedErrorURLLoad(const WebURL& fullURL);
 
 }  // namespace URLTestHelpers
 }  // namespace blink
 
 #endif