platform/testing/{URL|Unit}TestHelpers improvements

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

 /*
  * 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 10 matching lines @@
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * 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.
  */
 
+#include <functional>
+#include <list>
+#include <memory>
 #include "core/dom/NodeTraversal.h"
 #include "platform/testing/URLTestHelpers.h"
+#include "platform/testing/UnitTestHelpers.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebPrerender.h"
 #include "public/platform/WebPrerenderingSupport.h"
 #include "public/platform/WebString.h"
 #include "public/platform/WebURLLoaderMockFactory.h"
 #include "public/web/WebCache.h"
 #include "public/web/WebFrame.h"
 #include "public/web/WebPrerendererClient.h"
 #include "public/web/WebScriptSource.h"
 #include "public/web/WebView.h"
 #include "public/web/WebViewClient.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/tests/FrameTestHelpers.h"
 #include "wtf/PtrUtil.h"
-#include <functional>
-#include <list>
-#include <memory>
 
 namespace blink {
 
 namespace {
 
 WebURL toWebURL(const char* url) {
   return WebURL(blink::URLTestHelpers::toKURL(url));
 }
 
 class TestPrerendererClient : public WebPrerendererClient {
@@ skipping 87 matching lines @@
     m_abandonedPrerenders.push_back(prerender);
   }
 
   void prefetchFinished() override {}
 
   Vector<WebPrerender> m_addedPrerenders;
   Vector<WebPrerender> m_canceledPrerenders;
   Vector<WebPrerender> m_abandonedPrerenders;
 };
 
-class PrerenderingTest : public testing::Test {
+class PrerenderingTest : public ::testing::Test {
  public:
   ~PrerenderingTest() override {
     Platform::current()->getURLLoaderMockFactory()->unregisterAllURLs();
     WebCache::clear();
   }
 
   void initialize(const char* baseURL, const char* fileName) {
-    URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(baseURL),
-                                                 WebString::fromUTF8(fileName));
+    URLTestHelpers::registerMockedURLLoadFromBase(
+        WebString::fromUTF8(baseURL), blink::testing::webTestDataPath(),
+        WebString::fromUTF8(fileName));
     const bool RunJavascript = true;
     m_webViewHelper.initialize(RunJavascript);
     m_webViewHelper.webView()->setPrerendererClient(&m_prerendererClient);
 
     FrameTestHelpers::loadFrame(m_webViewHelper.webView()->mainFrame(),
                                 std::string(baseURL) + fileName);
   }
 
   void navigateAway() {
     FrameTestHelpers::loadFrame(m_webViewHelper.webView()->mainFrame(),
@@ skipping 287 matching lines @@
 
   WebPrerender relNextAndPrerender = prerendererClient()->releaseWebPrerender();
   EXPECT_EQ(toWebURL("http://rel-next-and-prerender.com/"),
             relNextAndPrerender.url());
   EXPECT_EQ(
       static_cast<unsigned>(PrerenderRelTypeNext | PrerenderRelTypePrerender),
       relNextAndPrerender.relTypes());
 }
 
 }  // namespace blink