platform/testing/{URL|Unit}TestHelpers improvements

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

Index: third_party/WebKit/Source/platform/testing/UnitTestHelpers.h
diff --git a/third_party/WebKit/Source/platform/testing/UnitTestHelpers.h b/third_party/WebKit/Source/platform/testing/UnitTestHelpers.h
index 92b3e2e3afd2133232d8cd131c7352812324750d..691ed54bd43c66095bc7a74a418d065ca11621fa 100644
--- a/third_party/WebKit/Source/platform/testing/UnitTestHelpers.h
+++ b/third_party/WebKit/Source/platform/testing/UnitTestHelpers.h
@@ -28,6 +28,7 @@
 
 #include "wtf/PassRefPtr.h"
 #include "wtf/text/WTFString.h"
+#include <string>
 
 namespace blink {
 
@@ -35,21 +36,35 @@ class SharedBuffer;
 
 namespace testing {
 
+// Note: You may want to use TestingPlatformSupportWithMockScheduler to
+// provides runUntilIdle() method that can work with WebURLLoaderMockFactory.
 void runPendingTasks();
 
-// Wait for delayed task to complete or timers to fire for |delayMs|
+// Waits for delayed task to complete or timers to fire for |delayMs|
 // milliseconds.
 void runDelayedTasks(double delayMs);
 
-String blinkRootDir();
-
-PassRefPtr<SharedBuffer> readFromFile(const String& path);
-
 void enterRunLoop();
 void exitRunLoop();
 
 void yieldCurrentThread();
 
+// Returns Blink top directory as an absolute path, e.g.
+// /src/third_party/WebKit.
+String blinkRootDir();
+
+// Returns test data absolute path for webkit_unit_tests, i.e.
+// <blinkRootDir>/Source/web/tests/data/<relativePath>.
+// It returns top web test directory if |relativePath| was not specified.
+String webTestDataPath(const std::string& relativePath = std::string());
+
+// Returns test data absolute path for blink_platform_unittests, i.e.
+// <blinkRootDir>/Source/platform/testing/data/<relativePath>.
+// It returns top platform test directory if |relativePath| was not specified.
+String platformTestDataPath(const std::string& relativePath = std::string());
+
+PassRefPtr<SharedBuffer> readFromFile(const String& path);
+
 }  // namespace testing
 }  // namespace blink