platform/testing/{URL|Unit}TestHelpers improvements

third_party/WebKit/Source/web/ExternalPopupMenuTest.cpp

 // Copyright (c) 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "web/ExternalPopupMenu.h"
 
 #include "core/HTMLNames.h"
 #include "core/dom/NodeComputedStyle.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/VisualViewport.h"
 #include "core/html/HTMLSelectElement.h"
 #include "core/layout/LayoutMenuList.h"
 #include "core/page/Page.h"
 #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"
 #include "public/web/WebExternalPopupMenu.h"
 #include "public/web/WebPopupMenuInfo.h"
 #include "public/web/WebSettings.h"
 #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() {}
 
  protected:
   void SetUp() override {
     m_dummyPageHolder = DummyPageHolder::create(IntSize(800, 600));
     HTMLSelectElement* element =
         HTMLSelectElement::create(m_dummyPageHolder->document());
     // Set the 4th an 5th items to have "display: none" property
     element->setInnerHTML(
@@ skipping 49 matching lines @@
    public:
     WebRect shownBounds() const { return m_shownBounds; }
 
    private:
     WebRect m_shownBounds;
   };
   WebRect m_shownBounds;
   MockWebExternalPopupMenu m_mockWebExternalPopupMenu;
 };
 
-class ExternalPopupMenuTest : public testing::Test {
+class ExternalPopupMenuTest : public ::testing::Test {
  public:
   ExternalPopupMenuTest() : m_baseURL("http://www.test.com") {}
 
  protected:
   void SetUp() override {
     m_helper.initialize(false, &m_webFrameClient, &m_webViewClient);
     webView()->setUseExternalPopupMenus(true);
   }
   void TearDown() override {
     Platform::current()->getURLLoaderMockFactory()->unregisterAllURLs();
     WebCache::clear();
   }
 
   void registerMockedURLLoad(const std::string& fileName) {
-    URLTestHelpers::registerMockedURLLoad(
-        URLTestHelpers::toKURL(m_baseURL + fileName),
-        WebString::fromUTF8(fileName.c_str()), WebString::fromUTF8("popup/"),
+    URLTestHelpers::registerMockedURLLoadFromBase(
+        WebString::fromUTF8(m_baseURL.c_str()),

[kinuko, 2017/01/26 09:32:41]

fromUTF8 can directly take std::string

[Takashi Toyoshima, 2017/01/26 10:57:57]

Done.

+        testing::webTestDataPath("popup"),
+        WebString::fromUTF8(fileName.c_str()),
         WebString::fromUTF8("text/html"));
   }
 
   void loadFrame(const std::string& fileName) {
     FrameTestHelpers::loadFrame(mainFrame(), m_baseURL + fileName);
     webView()->resize(WebSize(800, 600));
     webView()->updateAllLifecyclePhases();
   }
 
   WebViewImpl* webView() const { return m_helper.webView(); }
@@ skipping 100 matching lines @@
 
   WebExternalPopupMenuClient* client =
       static_cast<ExternalPopupMenu*>(select->popup());
   WebVector<int> indices;
   client->didAcceptIndices(indices);
   EXPECT_FALSE(select->popupIsVisible());
   EXPECT_EQ(-1, select->selectedIndex());
 }
 
 }  // namespace blink