Make the embedder responsible for creating the WebFrame

Source/web/tests/LinkHighlightTest.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:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 42 matching lines @@
 using namespace WebCore;
 
 namespace {
 
 TEST(LinkHighlightTest, verifyWebViewImplIntegration)
 {
     const std::string baseURL("http://www.test.com/");
     const std::string fileName("test_touch_link_highlight.html");
 
     URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(baseURL.c_str()), WebString::fromUTF8("test_touch_link_highlight.html"));
-    WebViewImpl* webViewImpl = toWebViewImpl(FrameTestHelpers::createWebViewAndLoad(baseURL + fileName, true));
+    FrameTestHelpers::WebViewHelper webViewHelper;
+    WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(baseURL + fileName, true);
     int pageWidth = 640;
     int pageHeight = 480;
     webViewImpl->resize(WebSize(pageWidth, pageHeight));
     webViewImpl->layout();
 
     WebGestureEvent touchEvent;
     touchEvent.type = WebInputEvent::GestureTapDown;
 
     // The coordinates below are linked to absolute positions in the referenced .html file.
     touchEvent.x = 20;
@@ skipping 41 matching lines @@
     }
     ASSERT_EQ(0U, webViewImpl->numLinkHighlights());
 
     touchEvent.y = 260; // A text input box.
     {
         PlatformGestureEventBuilder platformEvent(webViewImpl->mainFrameImpl()->frameView(), touchEvent);
         webViewImpl->enableTapHighlightAtPoint(platformEvent);
     }
     ASSERT_EQ(0U, webViewImpl->numLinkHighlights());
 
-    webViewImpl->close();
     Platform::current()->unitTestSupport()->unregisterAllMockedURLs();
 }
 
 class FakeWebFrameClient : public WebFrameClient {
     // To make the destructor public.
 };
 
 class FakeCompositingWebViewClient : public WebViewClient {
 public:
     virtual ~FakeCompositingWebViewClient()
@@ skipping 22 matching lines @@
     DEFINE_STATIC_LOCAL(FakeCompositingWebViewClient, client, ());
     return &client;
 }
 
 TEST(LinkHighlightTest, resetDuringNodeRemoval)
 {
     const std::string baseURL("http://www.test.com/");
     const std::string fileName("test_touch_link_highlight.html");
 
     URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(baseURL.c_str()), WebString::fromUTF8("test_touch_link_highlight.html"));
-    WebViewImpl* webViewImpl = toWebViewImpl(FrameTestHelpers::createWebViewAndLoad(baseURL + fileName, true, 0, compositingWebViewClient()));
+    FrameTestHelpers::WebViewHelper webViewHelper;
+    WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(baseURL + fileName, true, 0, compositingWebViewClient());
 
     int pageWidth = 640;
     int pageHeight = 480;
     webViewImpl->resize(WebSize(pageWidth, pageHeight));
     webViewImpl->layout();
 
     WebGestureEvent touchEvent;
     touchEvent.type = WebInputEvent::GestureTapDown;
     touchEvent.x = 20;
     touchEvent.y = 20;
 
     PlatformGestureEventBuilder platformEvent(webViewImpl->mainFrameImpl()->frameView(), touchEvent);
     Node* touchNode = webViewImpl->bestTapNode(platformEvent);
     ASSERT_TRUE(touchNode);
 
     webViewImpl->enableTapHighlightAtPoint(platformEvent);
     ASSERT_TRUE(webViewImpl->linkHighlight(0));
 
     GraphicsLayer* highlightLayer = webViewImpl->linkHighlight(0)->currentGraphicsLayerForTesting();
     ASSERT_TRUE(highlightLayer);
     EXPECT_TRUE(highlightLayer->linkHighlight(0));
 
     touchNode->remove(IGNORE_EXCEPTION);
     webViewImpl->layout();
     ASSERT_EQ(0U, highlightLayer->numLinkHighlights());
 
-    webViewImpl->close();
     Platform::current()->unitTestSupport()->unregisterAllMockedURLs();
 }
 
 TEST(LinkHighlightTest, multipleHighlights)
 {
     const std::string baseURL("http://www.test.com/");
     const std::string fileName("test_touch_link_highlight.html");
 
     URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(baseURL.c_str()), WebString::fromUTF8("test_touch_link_highlight.html"));
-    WebViewImpl* webViewImpl = toWebViewImpl(FrameTestHelpers::createWebViewAndLoad(baseURL + fileName, true, 0, compositingWebViewClient()));
+    FrameTestHelpers::WebViewHelper webViewHelper;
+    WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(baseURL + fileName, true, 0, compositingWebViewClient());
 
     int pageWidth = 640;
     int pageHeight = 480;
     webViewImpl->resize(WebSize(pageWidth, pageHeight));
     webViewImpl->layout();
 
     WebGestureEvent touchEvent;
     touchEvent.x = 50;
     touchEvent.y = 310;
     touchEvent.data.tap.width = 30;
     touchEvent.data.tap.height = 30;
 
     Vector<IntRect> goodTargets;
     Vector<Node*> highlightNodes;
     IntRect boundingBox(touchEvent.x - touchEvent.data.tap.width / 2, touchEvent.y - touchEvent.data.tap.height / 2, touchEvent.data.tap.width, touchEvent.data.tap.height);
     findGoodTouchTargets(boundingBox, webViewImpl->mainFrameImpl()->frame(), goodTargets, highlightNodes);
 
     webViewImpl->enableTapHighlights(highlightNodes);
     EXPECT_EQ(2U, webViewImpl->numLinkHighlights());
 
-    webViewImpl->close();
     Platform::current()->unitTestSupport()->unregisterAllMockedURLs();
 }
 
 } // namespace