Merge 141454

Source/WebKit/chromium/tests/WebFrameTest.cpp

 /*
  * Copyright (C) 2010 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 1620 matching lines @@
     event.type = WebInputEvent::GestureTap;
     event.x = x;
     event.y = y;
     event.data.tap.width = 50;
     event.data.tap.height = 50;
     return event;
 }
 
 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();
 
     client.resetTriggered();
     webViewImpl->handleInputEvent(fatTap(0, 0));
     EXPECT_FALSE(client.triggered());
 
     client.resetTriggered();
     webViewImpl->handleInputEvent(fatTap(200, 115));
     EXPECT_FALSE(client.triggered());
@@ skipping 34 matching lines @@
     webViewImpl->resize(WebSize(1000, 1000));
     webViewImpl->layout();
 
     client.resetTriggered();
     webViewImpl->handleInputEvent(fatTap(50, 50));
     EXPECT_FALSE(client.triggered());
 }
 
 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();
 
     client.resetTriggered();
     webViewImpl->handleInputEvent(fatTap(0, 0));
     EXPECT_FALSE(client.triggered());
 
     client.resetTriggered();
     webViewImpl->handleInputEvent(fatTap(200, 115));
     EXPECT_FALSE(client.triggered());
@@ skipping 64 matching lines @@
     webkit_support::RegisterMockedErrorURL(URLTestHelpers::toKURL(errorURL), response, error);
     frame->loadHistoryItem(errorHistoryItem);
     webkit_support::ServeAsynchronousMockedRequests();
 
     WebString text = frame->contentAsText(std::numeric_limits<size_t>::max());
     EXPECT_EQ("This should appear", std::string(text.utf8().data()));
     EXPECT_TRUE(webFrameClient.commitCalled());
 }
 
 } // namespace