platform/testing/{URL|Unit}TestHelpers improvements

third_party/WebKit/Source/web/tests/FrameSerializerTest.cpp

Index: third_party/WebKit/Source/web/tests/FrameSerializerTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/FrameSerializerTest.cpp b/third_party/WebKit/Source/web/tests/FrameSerializerTest.cpp
index 14d93673cb88237a224e0bd8928fac6c1a712083..88d5145e58417ffa8f4e3f74f1f8aee97abe7010 100644
--- a/third_party/WebKit/Source/web/tests/FrameSerializerTest.cpp
+++ b/third_party/WebKit/Source/web/tests/FrameSerializerTest.cpp
@@ -34,6 +34,7 @@
 #include "bindings/core/v8/V8BindingForTesting.h"
 #include "platform/SerializedResource.h"
 #include "platform/testing/URLTestHelpers.h"
+#include "platform/testing/UnitTestHelpers.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebString.h"
 #include "public/platform/WebThread.h"
@@ -50,17 +51,18 @@
 #include "wtf/Assertions.h"
 #include "wtf/Deque.h"
 #include "wtf/Vector.h"
+#include <string>
 
 using blink::URLTestHelpers::toKURL;
 using blink::URLTestHelpers::registerMockedURLLoad;
 
 namespace blink {
 
-class FrameSerializerTest : public testing::Test,
+class FrameSerializerTest : public ::testing::Test,
                             public FrameSerializer::Delegate {
  public:
   FrameSerializerTest()
-      : m_folder(WebString::fromUTF8("frameserializer/")),
+      : m_folder("frameserializer/"),
         m_baseUrl(toKURL("http://www.test.com")) {}
 
  protected:
@@ -74,14 +76,12 @@ class FrameSerializerTest : public testing::Test,
     WebCache::clear();
   }
 
-  void setBaseFolder(const char* folder) {
-    m_folder = WebString::fromUTF8(folder);
-  }
+  void setBaseFolder(const char* folder) { m_folder = folder; }
 
   void setRewriteURLFolder(const char* folder) { m_rewriteFolder = folder; }
 
   void registerURL(const KURL& url, const char* file, const char* mimeType) {
-    registerMockedURLLoad(url, WebString::fromUTF8(file), m_folder,
+    registerMockedURLLoad(url, testing::webTestDataPath(m_folder + file),
                           WebString::fromUTF8(mimeType));
   }
 
@@ -188,7 +188,7 @@ class FrameSerializerTest : public testing::Test,
   }
 
   FrameTestHelpers::WebViewHelper m_helper;
-  WebString m_folder;
+  std::string m_folder;
   KURL m_baseUrl;
   Deque<SerializedResource> m_resources;
   HashMap<String, String> m_rewriteURLs;