Make the embedder responsible for creating the WebFrame

Source/web/tests/PrerenderingTest.cpp

Index: Source/web/tests/PrerenderingTest.cpp
diff --git a/Source/web/tests/PrerenderingTest.cpp b/Source/web/tests/PrerenderingTest.cpp
index 39001c1ea011186a4874927d765b078329257471..883f37428b1367982f627ea84beb191088739a7b 100644
--- a/Source/web/tests/PrerenderingTest.cpp
+++ b/Source/web/tests/PrerenderingTest.cpp
@@ -177,49 +177,38 @@ private:
 
 class PrerenderingTest : public testing::Test {
 public:
-    PrerenderingTest() : m_webView(0)
-    {
-    }
-
     ~PrerenderingTest()
     {
         Platform::current()->unitTestSupport()->unregisterAllMockedURLs();
-        if (m_webView)
-            close();
     }
 
     void initialize(const char* baseURL, const char* fileName)
     {
-        ASSERT(!m_webView);
         URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(baseURL), WebString::fromUTF8(fileName));
         const bool RunJavascript = true;
-        m_webView = FrameTestHelpers::createWebView(RunJavascript);
-        m_webView->setPrerendererClient(&m_prerendererClient);
+        m_webViewHelper.initialize(RunJavascript);
+        m_webViewHelper.webView()->setPrerendererClient(&m_prerendererClient);
 
-        FrameTestHelpers::loadFrame(m_webView->mainFrame(), std::string(baseURL) + fileName);
+        FrameTestHelpers::loadFrame(m_webViewHelper.webView()->mainFrame(), std::string(baseURL) + fileName);
         Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests();
     }
 
     void navigateAway()
     {
-        FrameTestHelpers::loadFrame(m_webView->mainFrame(), "about:blank");
+        FrameTestHelpers::loadFrame(m_webViewHelper.webView()->mainFrame(), "about:blank");
     }
 
     void close()
     {
-        ASSERT(m_webView);
-
-        m_webView->mainFrame()->collectGarbage();
-
-        m_webView->close();
-        m_webView = 0;
+        m_webViewHelper.webView()->mainFrame()->collectGarbage();
+        m_webViewHelper.reset();
 
         WebCache::clear();
     }
 
     WebElement console()
     {
-        WebElement console = m_webView->mainFrame()->document().getElementById("console");
+        WebElement console = m_webViewHelper.webView()->mainFrame()->document().getElementById("console");
         ASSERT(console.nodeName() == "UL");
         return console;
     }
@@ -245,7 +234,7 @@ public:
 
     void executeScript(const char* code)
     {
-        m_webView->mainFrame()->executeScript(WebScriptSource(WebString::fromUTF8(code)));
+        m_webViewHelper.webView()->mainFrame()->executeScript(WebScriptSource(WebString::fromUTF8(code)));
     }
 
     TestPrerenderingSupport* prerenderingSupport()
@@ -262,7 +251,7 @@ private:
     TestPrerenderingSupport m_prerenderingSupport;
     TestPrerendererClient m_prerendererClient;
 
-    WebView* m_webView;
+    FrameTestHelpers::WebViewHelper m_webViewHelper;
 };
 
 TEST_F(PrerenderingTest, SinglePrerender)