Moved remaining legacy viewport tests to unit tests.

Source/web/tests/WebInputEventConversionTest.cpp

Index: Source/web/tests/WebInputEventConversionTest.cpp
diff --git a/Source/web/tests/WebInputEventConversionTest.cpp b/Source/web/tests/WebInputEventConversionTest.cpp
index fac6a8302bea56c54f512fe021f6d4b3521e70a6..f6b085f30b5fb678803f6825b3fd9df047371b0c 100644
--- a/Source/web/tests/WebInputEventConversionTest.cpp
+++ b/Source/web/tests/WebInputEventConversionTest.cpp
@@ -49,6 +49,7 @@
 
 using namespace blink;
 using namespace WebCore;
+using blink::FrameTestHelpers::setViewportSettings;
 
 namespace {
 
@@ -93,12 +94,11 @@ TEST(WebInputEventConversionTest, WebTouchEventBuilder)
 TEST(WebInputEventConversionTest, InputEventsScaling)
 {
     const std::string baseURL("http://www.test.com/");
-    const std::string fileName("fixed_layout.html");
+    const std::string fileName("no_viewport_tag.html");
 
-    URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(baseURL.c_str()), WebString::fromUTF8("fixed_layout.html"));
+    URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(baseURL.c_str()), WebString::fromUTF8("no_viewport_tag.html"));
     FrameTestHelpers::WebViewHelper webViewHelper;
-    WebViewImpl* webViewImpl = toWebViewImpl(webViewHelper.initializeAndLoad(baseURL + fileName, true));
-    webViewImpl->settings()->setViewportEnabled(true);
+    WebViewImpl* webViewImpl = toWebViewImpl(webViewHelper.initializeAndLoad(baseURL + fileName, true, 0, 0, setViewportSettings));
     int pageWidth = 640;
     int pageHeight = 480;
     webViewImpl->resize(WebSize(pageWidth, pageHeight));
@@ -293,12 +293,11 @@ TEST(WebInputEventConversionTest, InputEventsScaling)
 TEST(WebInputEventConversionTest, InputEventsTransform)
 {
     const std::string baseURL("http://www.test2.com/");
-    const std::string fileName("fixed_layout.html");
+    const std::string fileName("no_viewport_tag.html");
 
-    URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(baseURL.c_str()), WebString::fromUTF8("fixed_layout.html"));
+    URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(baseURL.c_str()), WebString::fromUTF8("no_viewport_tag.html"));
     FrameTestHelpers::WebViewHelper webViewHelper;
-    WebViewImpl* webViewImpl = toWebViewImpl(webViewHelper.initializeAndLoad(baseURL + fileName, true));
-    webViewImpl->settings()->setViewportEnabled(true);
+    WebViewImpl* webViewImpl = toWebViewImpl(webViewHelper.initializeAndLoad(baseURL + fileName, true, 0, 0, setViewportSettings));
     int pageWidth = 640;
     int pageHeight = 480;
     webViewImpl->resize(WebSize(pageWidth, pageHeight));