Make the embedder responsible for creating the WebFrame

Source/web/tests/RenderTableCellTest.cpp

 /*
  * Copyright (C) 2011 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
@@ skipping 25 matching lines @@
 
 #include <gtest/gtest.h>
 
 using namespace WebKit;
 
 namespace WebCore {
 
 namespace {
 
 class RenderTableCellDeathTest : 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;
+ 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);
+    }
 
-        if (webView)
-            return toWebFrameImpl(webView->mainFrame())->frame();
-
-        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()
     {
         m_cell = RenderTableCell::createAnonymous(document());
     }
 
     virtual void TearDown()
     {
         m_cell->destroy();
     }
 
-protected:
     RenderTableCell* m_cell;
+
+private:
+    static FrameTestHelpers::WebViewHelper* s_webViewHelper;
 };
 
+FrameTestHelpers::WebViewHelper* RenderTableCellDeathTest::s_webViewHelper = 0;
+
 TEST_F(RenderTableCellDeathTest, CanSetColumn)
 {
     static const unsigned columnIndex = 10;
     m_cell->setCol(columnIndex);
     EXPECT_EQ(columnIndex, m_cell->col());
 }
 
 TEST_F(RenderTableCellDeathTest, CanSetColumnToMaxColumnIndex)
 {
     m_cell->setCol(maxColumnIndex);
@@ skipping 12 matching lines @@
 TEST_F(RenderTableCellDeathTest, CrashIfSettingUnsetColumnIndex)
 {
     ASSERT_DEATH(m_cell->setCol(unsetColumnIndex), "");
 }
 
 #endif
 
 }
 
 } // namespace WebCore