platform/testing/{URL|Unit}TestHelpers improvements

third_party/WebKit/Source/web/ExternalPopupMenuTest.cpp

Index: third_party/WebKit/Source/web/ExternalPopupMenuTest.cpp
diff --git a/third_party/WebKit/Source/web/ExternalPopupMenuTest.cpp b/third_party/WebKit/Source/web/ExternalPopupMenuTest.cpp
index 8076ba7dc4ab44ff5a2abacb1a648c77a3eeec16..81bbf3bec14d7f447c4275e8cf83af85d1cc982c 100644
--- a/third_party/WebKit/Source/web/ExternalPopupMenuTest.cpp
+++ b/third_party/WebKit/Source/web/ExternalPopupMenuTest.cpp
@@ -4,6 +4,7 @@
 
 #include "web/ExternalPopupMenu.h"
 
+#include <memory>
 #include "core/HTMLNames.h"
 #include "core/dom/NodeComputedStyle.h"
 #include "core/frame/FrameHost.h"
@@ -14,6 +15,7 @@
 #include "core/testing/DummyPageHolder.h"
 #include "platform/PopupMenu.h"
 #include "platform/testing/URLTestHelpers.h"
+#include "platform/testing/UnitTestHelpers.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebURLLoaderMockFactory.h"
 #include "public/web/WebCache.h"
@@ -23,11 +25,10 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/tests/FrameTestHelpers.h"
-#include <memory>
 
 namespace blink {
 
-class ExternalPopupMenuDisplayNoneItemsTest : public testing::Test {
+class ExternalPopupMenuDisplayNoneItemsTest : public ::testing::Test {
  public:
   ExternalPopupMenuDisplayNoneItemsTest() {}
 
@@ -97,7 +98,7 @@ class ExternalPopupMenuWebFrameClient
   MockWebExternalPopupMenu m_mockWebExternalPopupMenu;
 };
 
-class ExternalPopupMenuTest : public testing::Test {
+class ExternalPopupMenuTest : public ::testing::Test {
  public:
   ExternalPopupMenuTest() : m_baseURL("http://www.test.com") {}
 
@@ -112,10 +113,9 @@ class ExternalPopupMenuTest : public testing::Test {
   }
 
   void registerMockedURLLoad(const std::string& fileName) {
-    URLTestHelpers::registerMockedURLLoad(
-        URLTestHelpers::toKURL(m_baseURL + fileName),
-        WebString::fromUTF8(fileName.c_str()), WebString::fromUTF8("popup/"),
-        WebString::fromUTF8("text/html"));
+    URLTestHelpers::registerMockedURLLoadFromBase(
+        WebString::fromUTF8(m_baseURL), testing::webTestDataPath("popup"),
+        WebString::fromUTF8(fileName), WebString::fromUTF8("text/html"));
   }
 
   void loadFrame(const std::string& fileName) {