Make the embedder responsible for creating the WebFrame

Source/web/tests/PrerenderingTest.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 159 matching lines @@
         m_abandonedPrerenders.push_back(prerender);
     }
 
     std::vector<WebPrerender> m_addedPrerenders;
     std::vector<WebPrerender> m_canceledPrerenders;
     std::vector<WebPrerender> m_abandonedPrerenders;
 };
 
 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;
     }
 
     unsigned consoleLength()
     {
         return console().childNodes().length() - 1;
     }
 
     std::string consoleAt(unsigned i)
     {
         ASSERT(consoleLength() > i);
 
         WebNode consoleListItem = console().childNodes().item(1 + i);
         ASSERT(consoleListItem.nodeName() == "LI");
         ASSERT(consoleListItem.hasChildNodes());
 
         WebNode textNode = consoleListItem.firstChild();
         ASSERT(textNode.nodeName() == "#text");
 
         return textNode.nodeValue().utf8().data();
     }
 
     void executeScript(const char* code)
     {
-        m_webView->mainFrame()->executeScript(WebScriptSource(WebString::fromUTF8(code)));
+        m_webViewHelper.webView()->mainFrame()->executeScript(WebScriptSource(WebString::fromUTF8(code)));
     }
 
     TestPrerenderingSupport* prerenderingSupport()
     {
         return &m_prerenderingSupport;
     }
 
     TestPrerendererClient* prerendererClient()
     {
         return &m_prerendererClient;
     }
 
 private:
     TestPrerenderingSupport m_prerenderingSupport;
     TestPrerendererClient m_prerendererClient;
 
-    WebView* m_webView;
+    FrameTestHelpers::WebViewHelper m_webViewHelper;
 };
 
 TEST_F(PrerenderingTest, SinglePrerender)
 {
     initialize("http://www.foo.com/", "prerender/single_prerender.html");
 
     WebPrerender webPrerender = prerendererClient()->releaseWebPrerender();
     EXPECT_FALSE(webPrerender.isNull());
     EXPECT_EQ(toWebURL("http://prerender.com/"), webPrerender.url());
 
@@ skipping 216 matching lines @@
     EXPECT_EQ(0u, prerenderingSupport()->cancelCount(webPrerender));
     EXPECT_EQ(1u, prerenderingSupport()->totalCount());
 
     // Change the rel of this prerender, make sure this is treated as a remove.
     executeScript("mutateRel()");
     EXPECT_EQ(1u, prerenderingSupport()->cancelCount(webPrerender));
     EXPECT_EQ(2u, prerenderingSupport()->totalCount());
 }
 
 } // namespace