Moved remaining legacy viewport tests to unit tests.

Source/web/tests/WebInputEventConversionTest.cpp

 /*
  * Copyright (C) 2012 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 31 matching lines @@
 #include "core/events/KeyboardEvent.h"
 #include "core/events/MouseEvent.h"
 #include "core/dom/Touch.h"
 #include "core/events/TouchEvent.h"
 #include "core/dom/TouchList.h"
 #include "core/frame/Frame.h"
 #include "core/frame/FrameView.h"
 
 using namespace blink;
 using namespace WebCore;
+using blink::FrameTestHelpers::setViewportSettings;
 
 namespace {
 
 PassRefPtr<WebCore::KeyboardEvent> createKeyboardEventWithLocation(WebCore::KeyboardEvent::KeyLocationCode location)
 {
     return WebCore::KeyboardEvent::create("keydown", true, true, 0, "", location, false, false, false, false, false);
 }
 
 int getModifiersForKeyLocationCode(WebCore::KeyboardEvent::KeyLocationCode location)
 {
@@ skipping 24 matching lines @@
 TEST(WebInputEventConversionTest, WebTouchEventBuilder)
 {
     RefPtr<WebCore::TouchEvent> event = WebCore::TouchEvent::create();
     WebMouseEventBuilder mouse(0, 0, *event);
     EXPECT_EQ(WebInputEvent::Undefined, mouse.type);
 }
 
 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));
     webViewImpl->layout();
 
     webViewImpl->setPageScaleFactor(2, WebPoint());
 
     FrameView* view = webViewImpl->page()->mainFrame()->view();
     RefPtr<Document> document = webViewImpl->page()->mainFrame()->document();
     DOMWindow* domWindow = webViewImpl->page()->mainFrame()->document()->domWindow();
@@ skipping 174 matching lines @@
         EXPECT_EQ(10, webTouchBuilder.touches[0].position.x);
         EXPECT_EQ(10, webTouchBuilder.touches[0].position.y);
         EXPECT_EQ(10, webTouchBuilder.touches[0].radiusX);
         EXPECT_EQ(10, webTouchBuilder.touches[0].radiusY);
     }
 }
 
 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));
     webViewImpl->layout();
 
     webViewImpl->setPageScaleFactor(2, WebPoint());
     webViewImpl->setRootLayerTransform(WebSize(10, 20), 1.5);
 
     FrameView* view = webViewImpl->page()->mainFrame()->view();
     RefPtr<Document> document = webViewImpl->page()->mainFrame()->document();
@@ skipping 120 matching lines @@
         EXPECT_EQ(100, platformTouchBuilder.touchPoints()[0].screenPos().x());
         EXPECT_EQ(110, platformTouchBuilder.touchPoints()[0].screenPos().y());
         EXPECT_EQ(30, platformTouchBuilder.touchPoints()[0].pos().x());
         EXPECT_EQ(30, platformTouchBuilder.touchPoints()[0].pos().y());
         EXPECT_EQ(10, platformTouchBuilder.touchPoints()[0].radiusX());
         EXPECT_EQ(10, platformTouchBuilder.touchPoints()[0].radiusY());
     }
 }
 
 } // anonymous namespace