Index: Source/core/rendering/RenderTableRowTest.cpp |
diff --git a/Source/web/tests/RenderTableRowTest.cpp b/Source/core/rendering/RenderTableRowTest.cpp |
similarity index 71% |
rename from Source/web/tests/RenderTableRowTest.cpp |
rename to Source/core/rendering/RenderTableRowTest.cpp |
index 4b0ee027137161ba3a7d4466bf1ba845d7e5cc17..a852ffdae13f59c1a7d58c26a8a0f7d15c9c024c 100644 |
--- a/Source/web/tests/RenderTableRowTest.cpp |
+++ b/Source/core/rendering/RenderTableRowTest.cpp |
@@ -27,11 +27,7 @@ |
#include "core/rendering/RenderTableRow.h" |
-#include "core/frame/LocalFrame.h" |
-#include "public/web/WebFrame.h" |
-#include "public/web/WebView.h" |
-#include "web/WebLocalFrameImpl.h" |
-#include "web/tests/FrameTestHelpers.h" |
+#include "core/testing/DummyPageHolder.h" |
#include <gtest/gtest.h> |
@@ -43,28 +39,10 @@ namespace { |
class RenderTableRowDeathTest : public testing::Test { |
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); |
- } |
- |
- static void TearDownTestCase() |
- { |
- delete s_webViewHelper; |
- } |
- |
- static Document* document() |
- { |
- return toWebLocalFrameImpl(s_webViewHelper->webView()->mainFrame())->frame()->document(); |
- } |
- |
virtual void SetUp() |
{ |
- m_row = RenderTableRow::createAnonymous(document()); |
+ m_pageHolder = DummyPageHolder::create(IntSize(800, 600)); |
+ m_row = RenderTableRow::createAnonymous(&m_pageHolder->document()); |
} |
virtual void TearDown() |
@@ -72,14 +50,10 @@ protected: |
m_row->destroy(); |
} |
+ OwnPtr<DummyPageHolder> m_pageHolder; |
RenderTableRow* m_row; |
- |
-private: |
- static FrameTestHelpers::WebViewHelper* s_webViewHelper; |
}; |
-FrameTestHelpers::WebViewHelper* RenderTableRowDeathTest::s_webViewHelper = 0; |
- |
TEST_F(RenderTableRowDeathTest, CanSetRow) |
{ |
static const unsigned rowIndex = 10; |