Make the embedder responsible for creating the WebFrame

Source/web/tests/RenderTableRowTest.cpp

Index: Source/web/tests/RenderTableRowTest.cpp
diff --git a/Source/web/tests/RenderTableRowTest.cpp b/Source/web/tests/RenderTableRowTest.cpp
index 912e27a95f9a9a0dd371683120038f3aa97d9d0a..adc8e6b160e2b8c7bf493390fe5fb24101dfcc72 100644
--- a/Source/web/tests/RenderTableRowTest.cpp
+++ b/Source/web/tests/RenderTableRowTest.cpp
@@ -43,23 +43,22 @@ namespace WebCore {
 namespace {
 
 class RenderTableRowDeathTest : public testing::Test {
-    // It's unfortunate that we have to get the whole browser stack to test one RenderObject
-    // but the code needs it.
-    static Frame* frame()
-    {
-        static WebView* webView;
-
-        if (webView)
-            return toWebFrameImpl(webView->mainFrame())->frame();
+protected:
+    static void SetUpTestCase() {
+        // It's unfortunate that we have to get the whole browser stack to test one RenderObject
+        // but the code needs it.
+        s_webViewHelper = new FrameTestHelpers::WebViewHelper();
+        s_webViewHelper->initializeAndLoad("about:blank");
+        s_webViewHelper->webView()->setFocus(true);
+    }
 
-        webView = FrameTestHelpers::createWebViewAndLoad("about:blank");
-        webView->setFocus(true);
-        return toWebFrameImpl(webView->mainFrame())->frame();
+    static void TearDownTestCase() {
+        delete s_webViewHelper;
     }
 
     static Document* document()
     {
-        return frame()->document();
+        return toWebFrameImpl(s_webViewHelper->webView()->mainFrame())->frame()->document();
     }
 
     virtual void SetUp()
@@ -72,10 +71,14 @@ class RenderTableRowDeathTest : public testing::Test {
         m_row->destroy();
     }
 
-protected:
     RenderTableRow* m_row;
+
+private:
+    static FrameTestHelpers::WebViewHelper* s_webViewHelper;
 };
 
+FrameTestHelpers::WebViewHelper* RenderTableRowDeathTest::s_webViewHelper = 0;
+
 TEST_F(RenderTableRowDeathTest, CanSetRow)
 {
     static const unsigned rowIndex = 10;