platform/testing/{URL|Unit}TestHelpers improvements

third_party/WebKit/Source/web/WebAssociatedURLLoaderImplTest.cpp

 /*
  * Copyright (C) 2011 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 50 matching lines @@
  public:
   WebAssociatedURLLoaderTest()
       : m_willFollowRedirect(false),
         m_didSendData(false),
         m_didReceiveResponse(false),
         m_didReceiveData(false),
         m_didReceiveCachedMetadata(false),
         m_didFinishLoading(false),
         m_didFail(false) {
     // Reuse one of the test files from WebFrameTest.
-    m_baseFilePath = testing::blinkRootDir();
-    m_baseFilePath.append("/Source/web/tests/data/");
-    m_frameFilePath = m_baseFilePath;
-    m_frameFilePath.append("iframes_test.html");
+    m_frameFilePath = testing::webTestDataPath("iframes_test.html");
   }
 
   KURL RegisterMockedUrl(const std::string& urlRoot,
                          const WTF::String& filename) {
     WebURLResponse response;
     response.setMIMEType("text/html");
-    WTF::String localPath = m_baseFilePath;
-    localPath.append(filename);
     KURL url = toKURL(urlRoot + filename.utf8().data());
-    Platform::current()->getURLLoaderMockFactory()->registerURL(url, response,
-                                                                localPath);
+    Platform::current()->getURLLoaderMockFactory()->registerURL(
+        url, response, testing::webTestDataPath(filename.utf8().data()));
     return url;
   }
 
   void SetUp() override {
     m_helper.initialize();
 
     std::string urlRoot = "http://www.test.com/";
     KURL url = RegisterMockedUrl(urlRoot, "iframes_test.html");
     const char* iframeSupportFiles[] = {
         "invisible_iframe.html", "visible_iframe.html",
@@ skipping 143 matching lines @@
     EXPECT_TRUE(m_didReceiveResponse);
     EXPECT_TRUE(m_didReceiveData);
     EXPECT_TRUE(m_didFinishLoading);
 
     return !m_actualResponse.httpHeaderField(headerNameString).isEmpty();
   }
 
   WebFrame* mainFrame() const { return m_helper.webView()->mainFrame(); }
 
  protected:
-  String m_baseFilePath;
   String m_frameFilePath;
   FrameTestHelpers::WebViewHelper m_helper;
 
   std::unique_ptr<WebAssociatedURLLoader> m_expectedLoader;
   WebURLResponse m_actualResponse;
   WebURLResponse m_expectedResponse;
   WebURLRequest m_expectedNewRequest;
   WebURLResponse m_expectedRedirectResponse;
   bool m_willFollowRedirect;
   bool m_didSendData;
@@ skipping 417 matching lines @@
   m_expectedLoader->loadAsynchronously(request, this);
   serveRequests();
   EXPECT_TRUE(m_didReceiveResponse);
   EXPECT_TRUE(m_didReceiveData);
   EXPECT_TRUE(m_didFinishLoading);
 
   EXPECT_FALSE(m_actualResponse.httpHeaderField(headerNameString).isEmpty());
 }
 
 }  // namespace blink