Merge 141454

Source/WebKit/chromium/tests/WebFrameTest.cpp

Index: Source/WebKit/chromium/tests/WebFrameTest.cpp
===================================================================
--- Source/WebKit/chromium/tests/WebFrameTest.cpp	(revision 141475)
+++ Source/WebKit/chromium/tests/WebFrameTest.cpp	(working copy)
@@ -1638,13 +1638,14 @@
 
 TEST_F(WebFrameTest, DisambiguationPopup)
 {
-    registerMockedHttpURLLoad("disambiguation_popup.html");
+    const std::string htmlFile = "disambiguation_popup.html";
+    registerMockedHttpURLLoad(htmlFile);
 
     DisambiguationPopupTestWebViewClient client;
 
     // Make sure we initialize to minimum scale, even if the window size
     // only becomes available after the load begins.
-    WebViewImpl* webViewImpl = static_cast<WebViewImpl*>(FrameTestHelpers::createWebViewAndLoad(m_baseURL + "disambiguation_popup.html", true, 0, &client));
+    WebViewImpl* webViewImpl = static_cast<WebViewImpl*>(FrameTestHelpers::createWebViewAndLoad(m_baseURL + htmlFile, true, 0, &client));
     webViewImpl->resize(WebSize(1000, 1000));
     webViewImpl->layout();
 
@@ -1699,13 +1700,14 @@
 
 TEST_F(WebFrameTest, DisambiguationPopupMobileSite)
 {
-    registerMockedHttpURLLoad("disambiguation_popup_mobile_site.html");
+    const std::string htmlFile = "disambiguation_popup_mobile_site.html";
+    registerMockedHttpURLLoad(htmlFile);
 
     DisambiguationPopupTestWebViewClient client;
 
     // Make sure we initialize to minimum scale, even if the window size
     // only becomes available after the load begins.
-    WebViewImpl* webViewImpl = static_cast<WebViewImpl*>(FrameTestHelpers::createWebViewAndLoad(m_baseURL + "disambiguation_popup.html", true, 0, &client));
+    WebViewImpl* webViewImpl = static_cast<WebViewImpl*>(FrameTestHelpers::createWebViewAndLoad(m_baseURL + htmlFile, true, 0, &client));
     webViewImpl->resize(WebSize(1000, 1000));
     webViewImpl->layout();