platform/testing/{URL|Unit}TestHelpers improvements

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

 /*
  * Copyright (C) 2014 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 66 matching lines @@
     return true;
   }
 
  private:
   std::string m_text;
   size_t m_index;
 };
 
 class MHTMLTest : public ::testing::Test {
  public:
-  MHTMLTest() {
-    m_filePath = testing::blinkRootDir();
-    m_filePath.append("/Source/web/tests/data/mhtml/");
-  }
+  MHTMLTest() { m_filePath = testing::webTestDataPath("mhtml/"); }
 
  protected:
   void SetUp() override { m_helper.initialize(); }
 
   void TearDown() override {
     Platform::current()->getURLLoaderMockFactory()->unregisterAllURLs();
     WebCache::clear();
   }
 
   void registerMockedURLLoad(const std::string& url,
-                             const WebString& fileName) {
+                             const std::string& fileName) {
     URLTestHelpers::registerMockedURLLoad(
-        toKURL(url), fileName, WebString::fromUTF8("mhtml/"),
+        toKURL(url),
+        testing::webTestDataPath(WebString::fromUTF8("mhtml/" + fileName)),
         WebString::fromUTF8("multipart/related"));
   }
 
   void loadURLInTopFrame(const WebURL& url) {
     FrameTestHelpers::loadFrame(m_helper.webView()->mainFrame(),
                                 url.string().utf8().data());
   }
 
   Page* page() const { return m_helper.webView()->page(); }
 
@@ skipping 69 matching lines @@
   FrameTestHelpers::WebViewHelper m_helper;
 };
 
 // Checks that the domain is set to the actual MHTML file, not the URL it was
 // generated from.
 TEST_F(MHTMLTest, CheckDomain) {
   const char kFileURL[] = "file:///simple_test.mht";
 
   // Register the mocked frame and load it.
   WebURL url = toKURL(kFileURL);
-  registerMockedURLLoad(kFileURL, WebString::fromUTF8("simple_test.mht"));
+  registerMockedURLLoad(kFileURL, "simple_test.mht");
   loadURLInTopFrame(url);
   ASSERT_TRUE(page());
   LocalFrame* frame = toLocalFrame(page()->mainFrame());
   ASSERT_TRUE(frame);
   Document* document = frame->document();
   ASSERT_TRUE(document);
 
   EXPECT_STREQ(kFileURL, frame->domWindow()->location()->href().ascii().data());
 
   SecurityOrigin* origin = document->getSecurityOrigin();
@@ skipping 59 matching lines @@
   EXPECT_EQ(nullptr, MHTMLArchive::create(specialSchemeURL, data.get()));
   SchemeRegistry::registerURLSchemeAsLocal("fooscheme");
   EXPECT_NE(nullptr, MHTMLArchive::create(specialSchemeURL, data.get()));
 }
 
 // Checks that full sandboxing protection has been turned on.
 TEST_F(MHTMLTest, EnforceSandboxFlags) {
   const char kURL[] = "http://www.example.com";
 
   // Register the mocked frame and load it.
-  registerMockedURLLoad(kURL, WebString::fromUTF8("simple_test.mht"));
+  registerMockedURLLoad(kURL, "simple_test.mht");
   loadURLInTopFrame(toKURL(kURL));
   ASSERT_TRUE(page());
   LocalFrame* frame = toLocalFrame(page()->mainFrame());
   ASSERT_TRUE(frame);
   Document* document = frame->document();
   ASSERT_TRUE(document);
 
   // Full sandboxing should be turned on.
   EXPECT_TRUE(document->isSandboxed(SandboxAll));
 
   // MHTML document should be loaded into unique origin.
   EXPECT_TRUE(document->getSecurityOrigin()->isUnique());
   // Script execution should be disabled.
   EXPECT_FALSE(frame->script().canExecuteScripts(NotAboutToExecuteScript));
 }
 
 }  // namespace blink