Unify test classes to use PageTestBase

Bug: 771800
Change-Id: I7d5eb8b4049aaa3536723fd377a54b76929837a5
Reviewed-on: https://chromium-review.googlesource.com/800090Reviewed-by: Eric Willigers <ericwilligers@chromium.org>
Reviewed-by: Koji Ishii <kojii@chromium.org>
Commit-Queue: Koji Ishii <kojii@chromium.org>
Cr-Commit-Position: refs/heads/master@{#521635}

third_party/WebKit/Source/core/animation/CompositorAnimationsTest.cpp

@@ -82,10 +82,8 @@ class AnimationCompositorAnimationsTest : public RenderingTest {
   std::unique_ptr<StringKeyframeVector> keyframe_vector5_;
   Persistent<StringKeyframeEffectModel> keyframe_animation_effect5_;
 
-  Persistent<Document> document_;
   Persistent<Element> element_;
   Persistent<DocumentTimeline> timeline_;
-  std::unique_ptr<DummyPageHolder> page_holder_;
 
   void SetUp() override {
     RenderingTest::SetUp();
@@ -113,13 +111,11 @@ class AnimationCompositorAnimationsTest : public RenderingTest {
     keyframe_animation_effect5_ =
         StringKeyframeEffectModel::Create(*keyframe_vector5_);
 
-    page_holder_ = DummyPageHolder::Create();
-    document_ = &page_holder_->GetDocument();
-    document_->GetAnimationClock().ResetTimeForTesting();
+    GetAnimationClock().ResetTimeForTesting();
 
-    timeline_ = DocumentTimeline::Create(document_.Get());
+    timeline_ = DocumentTimeline::Create(&GetDocument());
     timeline_->ResetForTesting();
-    element_ = document_->createElement("test");
+    element_ = GetDocument().createElement("test");
 
     helper_.Initialize(nullptr, nullptr, nullptr, &ConfigureSettings);
     base_url_ = "http://www.test.com/";
@@ -287,9 +283,8 @@ class AnimationCompositorAnimationsTest : public RenderingTest {
   }
 
   void SimulateFrame(double time) {
-    document_->GetAnimationClock().UpdateTime(time);
-    document_->GetPendingAnimations().Update(Optional<CompositorElementIdSet>(),
-                                             false);
+    GetAnimationClock().UpdateTime(time);
+    GetPendingAnimations().Update(Optional<CompositorElementIdSet>(), false);
     timeline_->ServiceAnimations(kTimingUpdateForAnimationFrame);
   }
 
@@ -1194,7 +1189,7 @@ TEST_F(AnimationCompositorAnimationsTest,
 
 TEST_F(AnimationCompositorAnimationsTest,
        cancelIncompatibleCompositorAnimations) {
-  Persistent<Element> element = document_->createElement("shared");
+  Persistent<Element> element = GetDocument().createElement("shared");
 
   LayoutObjectProxy* layout_object = LayoutObjectProxy::Create(element.Get());
   element->SetLayoutObject(layout_object);
@@ -1284,7 +1279,7 @@ void UpdateDummyEffectNode(ObjectPaintProperties& properties,
 
 TEST_F(AnimationCompositorAnimationsTest,
        canStartElementOnCompositorTransformSPv2) {
-  Persistent<Element> element = document_->createElement("shared");
+  Persistent<Element> element = GetDocument().createElement("shared");
   LayoutObjectProxy* layout_object = LayoutObjectProxy::Create(element.Get());
   element->SetLayoutObject(layout_object);
 
@@ -1316,7 +1311,7 @@ TEST_F(AnimationCompositorAnimationsTest,
 
 TEST_F(AnimationCompositorAnimationsTest,
        canStartElementOnCompositorEffectSPv2) {
-  Persistent<Element> element = document_->createElement("shared");
+  Persistent<Element> element = GetDocument().createElement("shared");
   LayoutObjectProxy* layout_object = LayoutObjectProxy::Create(element.Get());
   element->SetLayoutObject(layout_object);
 

third_party/WebKit/Source/core/animation/DocumentTimelineTest.cpp

@@ -39,7 +39,7 @@
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/dom/QualifiedName.h"
-#include "core/testing/DummyPageHolder.h"
+#include "core/testing/PageTestBase.h"
 #include "platform/weborigin/KURL.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -56,12 +56,12 @@ class MockPlatformTiming : public DocumentTimeline::PlatformTiming {
   }
 };
 
-class AnimationDocumentTimelineTest : public ::testing::Test {
+class AnimationDocumentTimelineTest : public PageTestBase {
  protected:
   void SetUp() override {
-    page_holder = DummyPageHolder::Create();
-    document = &page_holder->GetDocument();
-    document->GetAnimationClock().ResetTimeForTesting();
+    PageTestBase::SetUp(IntSize());
+    document = &GetDocument();
+    GetAnimationClock().ResetTimeForTesting();
     element = Element::Create(QualifiedName::Null(), document.Get());
     platform_timing = new MockPlatformTiming;
     timeline = DocumentTimeline::Create(document.Get(), 0.0, platform_timing);
@@ -77,9 +77,8 @@ class AnimationDocumentTimelineTest : public ::testing::Test {
   }
 
   void UpdateClockAndService(double time) {
-    document->GetAnimationClock().UpdateTime(time);
-    document->GetPendingAnimations().Update(Optional<CompositorElementIdSet>(),
-                                            false);
+    GetAnimationClock().UpdateTime(time);
+    GetPendingAnimations().Update(Optional<CompositorElementIdSet>(), false);
     timeline->ServiceAnimations(kTimingUpdateForAnimationFrame);
     timeline->ScheduleNextService();
   }
@@ -88,7 +87,6 @@ class AnimationDocumentTimelineTest : public ::testing::Test {
     return StringKeyframeEffectModel::Create(StringKeyframeVector());
   }
 
-  std::unique_ptr<DummyPageHolder> page_holder;
   Persistent<Document> document;
   Persistent<Element> element;
   Persistent<DocumentTimeline> timeline;
@@ -136,12 +134,12 @@ TEST_F(AnimationDocumentTimelineTest, EmptyForwardsKeyframeAnimation) {
 TEST_F(AnimationDocumentTimelineTest, ZeroTime) {
   bool is_null;
 
-  document->GetAnimationClock().UpdateTime(100);
+  GetAnimationClock().UpdateTime(100);
   EXPECT_EQ(100, timeline->CurrentTimeInternal());
   EXPECT_EQ(100, timeline->CurrentTimeInternal(is_null));
   EXPECT_FALSE(is_null);
 
-  document->GetAnimationClock().UpdateTime(200);
+  GetAnimationClock().UpdateTime(200);
   EXPECT_EQ(200, timeline->CurrentTimeInternal());
   EXPECT_EQ(200, timeline->CurrentTimeInternal(is_null));
   EXPECT_FALSE(is_null);
@@ -153,13 +151,13 @@ TEST_F(AnimationDocumentTimelineTest, PlaybackRateNormal) {
 
   timeline->SetPlaybackRate(1.0);
   EXPECT_EQ(1.0, timeline->PlaybackRate());
-  document->GetAnimationClock().UpdateTime(100);
+  GetAnimationClock().UpdateTime(100);
   EXPECT_EQ(zero_time, timeline->ZeroTime());
   EXPECT_EQ(100, timeline->CurrentTimeInternal());
   EXPECT_EQ(100, timeline->CurrentTimeInternal(is_null));
   EXPECT_FALSE(is_null);
 
-  document->GetAnimationClock().UpdateTime(200);
+  GetAnimationClock().UpdateTime(200);
   EXPECT_EQ(zero_time, timeline->ZeroTime());
   EXPECT_EQ(200, timeline->CurrentTimeInternal());
   EXPECT_EQ(200, timeline->CurrentTimeInternal(is_null));
@@ -180,13 +178,13 @@ TEST_F(AnimationDocumentTimelineTest, PlaybackRateNormalWithOriginTime) {
   EXPECT_EQ(1000, timeline->CurrentTimeInternal(is_null));
   EXPECT_FALSE(is_null);
 
-  document->GetAnimationClock().UpdateTime(100);
+  GetAnimationClock().UpdateTime(100);
   EXPECT_EQ(-1000, timeline->ZeroTime());
   EXPECT_EQ(1100, timeline->CurrentTimeInternal());
   EXPECT_EQ(1100, timeline->CurrentTimeInternal(is_null));
   EXPECT_FALSE(is_null);
 
-  document->GetAnimationClock().UpdateTime(200);
+  GetAnimationClock().UpdateTime(200);
   EXPECT_EQ(-1000, timeline->ZeroTime());
   EXPECT_EQ(1200, timeline->CurrentTimeInternal());
   EXPECT_EQ(1200, timeline->CurrentTimeInternal(is_null));
@@ -196,7 +194,7 @@ TEST_F(AnimationDocumentTimelineTest, PlaybackRateNormalWithOriginTime) {
 TEST_F(AnimationDocumentTimelineTest, PlaybackRatePause) {
   bool is_null;
 
-  document->GetAnimationClock().UpdateTime(100);
+  GetAnimationClock().UpdateTime(100);
   EXPECT_EQ(0, timeline->ZeroTime());
   EXPECT_EQ(100, timeline->CurrentTimeInternal());
   EXPECT_EQ(100, timeline->CurrentTimeInternal(is_null));
@@ -204,14 +202,14 @@ TEST_F(AnimationDocumentTimelineTest, PlaybackRatePause) {
 
   timeline->SetPlaybackRate(0.0);
   EXPECT_EQ(0.0, timeline->PlaybackRate());
-  document->GetAnimationClock().UpdateTime(200);
+  GetAnimationClock().UpdateTime(200);
   EXPECT_EQ(100, timeline->ZeroTime());
   EXPECT_EQ(100, timeline->CurrentTimeInternal());
   EXPECT_EQ(100, timeline->CurrentTimeInternal(is_null));
 
   timeline->SetPlaybackRate(1.0);
   EXPECT_EQ(1.0, timeline->PlaybackRate());
-  document->GetAnimationClock().UpdateTime(400);
+  GetAnimationClock().UpdateTime(400);
   EXPECT_EQ(100, timeline->ZeroTime());
   EXPECT_EQ(300, timeline->CurrentTimeInternal());
   EXPECT_EQ(300, timeline->CurrentTimeInternal(is_null));
@@ -232,7 +230,7 @@ TEST_F(AnimationDocumentTimelineTest, PlaybackRatePauseWithOriginTime) {
   EXPECT_EQ(1000, timeline->CurrentTimeInternal(is_null));
   EXPECT_FALSE(is_null);
 
-  document->GetAnimationClock().UpdateTime(100);
+  GetAnimationClock().UpdateTime(100);
   EXPECT_EQ(-1000, timeline->ZeroTime());
   EXPECT_EQ(1100, timeline->CurrentTimeInternal());
   EXPECT_EQ(1100, timeline->CurrentTimeInternal(is_null));
@@ -240,7 +238,7 @@ TEST_F(AnimationDocumentTimelineTest, PlaybackRatePauseWithOriginTime) {
 
   timeline->SetPlaybackRate(0.0);
   EXPECT_EQ(0.0, timeline->PlaybackRate());
-  document->GetAnimationClock().UpdateTime(200);
+  GetAnimationClock().UpdateTime(200);
   EXPECT_EQ(1100, timeline->ZeroTime());
   EXPECT_EQ(1100, timeline->CurrentTimeInternal());
   EXPECT_EQ(1100, timeline->CurrentTimeInternal(is_null));
@@ -251,7 +249,7 @@ TEST_F(AnimationDocumentTimelineTest, PlaybackRatePauseWithOriginTime) {
   EXPECT_EQ(1100, timeline->CurrentTimeInternal());
   EXPECT_EQ(1100, timeline->CurrentTimeInternal(is_null));
 
-  document->GetAnimationClock().UpdateTime(400);
+  GetAnimationClock().UpdateTime(400);
   EXPECT_EQ(-900, timeline->ZeroTime());
   EXPECT_EQ(1300, timeline->CurrentTimeInternal());
   EXPECT_EQ(1300, timeline->CurrentTimeInternal(is_null));
@@ -262,7 +260,7 @@ TEST_F(AnimationDocumentTimelineTest, PlaybackRatePauseWithOriginTime) {
 TEST_F(AnimationDocumentTimelineTest, PlaybackRateSlow) {
   bool is_null;
 
-  document->GetAnimationClock().UpdateTime(100);
+  GetAnimationClock().UpdateTime(100);
   EXPECT_EQ(0, timeline->ZeroTime());
   EXPECT_EQ(100, timeline->CurrentTimeInternal());
   EXPECT_EQ(100, timeline->CurrentTimeInternal(is_null));
@@ -270,14 +268,14 @@ TEST_F(AnimationDocumentTimelineTest, PlaybackRateSlow) {
 
   timeline->SetPlaybackRate(0.5);
   EXPECT_EQ(0.5, timeline->PlaybackRate());
-  document->GetAnimationClock().UpdateTime(300);
+  GetAnimationClock().UpdateTime(300);
   EXPECT_EQ(-100, timeline->ZeroTime());
   EXPECT_EQ(200, timeline->CurrentTimeInternal());
   EXPECT_EQ(200, timeline->CurrentTimeInternal(is_null));
 
   timeline->SetPlaybackRate(1.0);
   EXPECT_EQ(1.0, timeline->PlaybackRate());
-  document->GetAnimationClock().UpdateTime(400);
+  GetAnimationClock().UpdateTime(400);
   EXPECT_EQ(100, timeline->ZeroTime());
   EXPECT_EQ(300, timeline->CurrentTimeInternal());
   EXPECT_EQ(300, timeline->CurrentTimeInternal(is_null));
@@ -288,7 +286,7 @@ TEST_F(AnimationDocumentTimelineTest, PlaybackRateSlow) {
 TEST_F(AnimationDocumentTimelineTest, PlaybackRateFast) {
   bool is_null;
 
-  document->GetAnimationClock().UpdateTime(100);
+  GetAnimationClock().UpdateTime(100);
   EXPECT_EQ(0, timeline->ZeroTime());
   EXPECT_EQ(100, timeline->CurrentTimeInternal());
   EXPECT_EQ(100, timeline->CurrentTimeInternal(is_null));
@@ -296,14 +294,14 @@ TEST_F(AnimationDocumentTimelineTest, PlaybackRateFast) {
 
   timeline->SetPlaybackRate(2.0);
   EXPECT_EQ(2.0, timeline->PlaybackRate());
-  document->GetAnimationClock().UpdateTime(300);
+  GetAnimationClock().UpdateTime(300);
   EXPECT_EQ(50, timeline->ZeroTime());
   EXPECT_EQ(500, timeline->CurrentTimeInternal());
   EXPECT_EQ(500, timeline->CurrentTimeInternal(is_null));
 
   timeline->SetPlaybackRate(1.0);
   EXPECT_EQ(1.0, timeline->PlaybackRate());
-  document->GetAnimationClock().UpdateTime(400);
+  GetAnimationClock().UpdateTime(400);
   EXPECT_EQ(-200, timeline->ZeroTime());
   EXPECT_EQ(600, timeline->CurrentTimeInternal());
   EXPECT_EQ(600, timeline->CurrentTimeInternal(is_null));
@@ -319,7 +317,7 @@ TEST_F(AnimationDocumentTimelineTest, PlaybackRateFastWithOriginTime) {
                                       platform_timing);
   timeline->ResetForTesting();
 
-  document->GetAnimationClock().UpdateTime(100);
+  GetAnimationClock().UpdateTime(100);
   EXPECT_EQ(-1000, timeline->ZeroTime());
   EXPECT_EQ(1100, timeline->CurrentTimeInternal());
   EXPECT_EQ(1100, timeline->CurrentTimeInternal(is_null));
@@ -331,7 +329,7 @@ TEST_F(AnimationDocumentTimelineTest, PlaybackRateFastWithOriginTime) {
   EXPECT_EQ(1100, timeline->CurrentTimeInternal());
   EXPECT_EQ(1100, timeline->CurrentTimeInternal(is_null));
 
-  document->GetAnimationClock().UpdateTime(300);
+  GetAnimationClock().UpdateTime(300);
   EXPECT_EQ(-450, timeline->ZeroTime());
   EXPECT_EQ(1500, timeline->CurrentTimeInternal());
   EXPECT_EQ(1500, timeline->CurrentTimeInternal(is_null));
@@ -342,7 +340,7 @@ TEST_F(AnimationDocumentTimelineTest, PlaybackRateFastWithOriginTime) {
   EXPECT_EQ(1500, timeline->CurrentTimeInternal());
   EXPECT_EQ(1500, timeline->CurrentTimeInternal(is_null));
 
-  document->GetAnimationClock().UpdateTime(400);
+  GetAnimationClock().UpdateTime(400);
   EXPECT_EQ(-1200, timeline->ZeroTime());
   EXPECT_EQ(1600, timeline->CurrentTimeInternal());
   EXPECT_EQ(1600, timeline->CurrentTimeInternal(is_null));

third_party/WebKit/Source/core/css/cssom/FilteredComputedStylePropertyMapTest.cpp

@@ -4,29 +4,32 @@
 
 #include "core/css/cssom/FilteredComputedStylePropertyMap.h"
 
+#include <memory>
 #include "core/css/CSSComputedStyleDeclaration.h"
 #include "core/dom/Element.h"
-#include "core/testing/DummyPageHolder.h"
+#include "core/testing/PageTestBase.h"
 #include "platform/heap/Handle.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include <memory>
 
 namespace blink {
 
-class FilteredComputedStylePropertyMapTest : public ::testing::Test {
+class FilteredComputedStylePropertyMapTest : public PageTestBase {
  public:
-  FilteredComputedStylePropertyMapTest() : page_(DummyPageHolder::Create()) {
-    declaration_ = CSSComputedStyleDeclaration::Create(
-        page_->GetDocument().documentElement());
-  }
+  FilteredComputedStylePropertyMapTest() {}
 
   CSSComputedStyleDeclaration* Declaration() const {
     return declaration_.Get();
   }
-  Node* PageNode() { return page_->GetDocument().documentElement(); }
+
+  void SetUp() override {
+    PageTestBase::SetUp(IntSize());
+    declaration_ =
+        CSSComputedStyleDeclaration::Create(GetDocument().documentElement());
+  }
+
+  Node* PageNode() { return GetDocument().documentElement(); }
 
  private:
-  std::unique_ptr<DummyPageHolder> page_;
   Persistent<CSSComputedStyleDeclaration> declaration_;
 };
 

third_party/WebKit/Source/core/html/canvas/CanvasAsyncBlobCreatorTest.cpp

@@ -5,7 +5,7 @@
 #include "core/html/canvas/CanvasAsyncBlobCreator.h"
 
 #include "core/html/ImageData.h"
-#include "core/testing/DummyPageHolder.h"
+#include "core/testing/PageTestBase.h"
 #include "platform/testing/UnitTestHelpers.h"
 #include "platform/wtf/Functional.h"
 #include "public/platform/Platform.h"
@@ -149,7 +149,7 @@ class MockCanvasAsyncBlobCreatorWithoutCompleteJpeg
 
 //==============================================================================
 
-class CanvasAsyncBlobCreatorTest : public ::testing::Test {
+class CanvasAsyncBlobCreatorTest : public PageTestBase {
  public:
   // Png unit tests
   void PrepareMockCanvasAsyncBlobCreatorWithoutStartPng();
@@ -169,14 +169,11 @@ class CanvasAsyncBlobCreatorTest : public ::testing::Test {
   void TearDown() override;
 
  private:
-  Document& GetDocument() { return dummy_page_holder_->GetDocument(); }
 
   Persistent<MockCanvasAsyncBlobCreator> async_blob_creator_;
-  std::unique_ptr<DummyPageHolder> dummy_page_holder_;
 };
 
 CanvasAsyncBlobCreatorTest::CanvasAsyncBlobCreatorTest() {
-  dummy_page_holder_ = DummyPageHolder::Create();
 }
 
 void CanvasAsyncBlobCreatorTest::

third_party/WebKit/Source/core/loader/resource/CSSStyleSheetResourceTest.cpp

@@ -19,7 +19,7 @@
 #include "core/css/parser/CSSParserSelector.h"
 #include "core/dom/Document.h"
 #include "core/loader/resource/ImageResource.h"
-#include "core/testing/DummyPageHolder.h"
+#include "core/testing/PageTestBase.h"
 #include "platform/heap/Handle.h"
 #include "platform/heap/Heap.h"
 #include "platform/loader/fetch/FetchContext.h"
@@ -43,19 +43,22 @@ class Document;
 
 namespace {
 
-class CSSStyleSheetResourceTest : public ::testing::Test {
+class CSSStyleSheetResourceTest : public PageTestBase {
  protected:
   CSSStyleSheetResourceTest() {
     original_memory_cache_ =
         ReplaceMemoryCacheForTesting(MemoryCache::Create());
-    page_ = DummyPageHolder::Create();
-    GetDocument().SetURL(KURL(NullURL(), "https://localhost/"));
   }
 
   ~CSSStyleSheetResourceTest() override {
     ReplaceMemoryCacheForTesting(original_memory_cache_.Release());
   }
 
+  void SetUp() override {
+    PageTestBase::SetUp(IntSize());
+    GetDocument().SetURL(KURL(NullURL(), "https://localhost/"));
+  }
+
   CSSStyleSheetResource* CreateAndSaveTestStyleSheetResource() {
     const char kUrl[] = "https://localhost/style.css";
     KURL css_url(NullURL(), kUrl);
@@ -69,10 +72,7 @@ class CSSStyleSheetResourceTest : public ::testing::Test {
     return css_resource;
   }
 
-  Document& GetDocument() { return page_->GetDocument(); }
-
   Persistent<MemoryCache> original_memory_cache_;
-  std::unique_ptr<DummyPageHolder> page_;
 };
 
 TEST_F(CSSStyleSheetResourceTest, DuplicateResourceNotCached) {

third_party/WebKit/Source/core/testing/PageTestBase.cpp

@@ -101,4 +101,12 @@ Element* PageTestBase::GetElementById(const char* id) const {
   return GetDocument().getElementById(id);
 }
 
+AnimationClock& PageTestBase::GetAnimationClock() {
+  return GetDocument().GetAnimationClock();
+}
+
+PendingAnimations& PageTestBase::GetPendingAnimations() {
+  return GetDocument().GetPendingAnimations();
+}
+
 }  // namespace blink

third_party/WebKit/Source/core/testing/PageTestBase.h

@@ -38,6 +38,8 @@ class PageTestBase : public ::testing::Test {
   DummyPageHolder& GetDummyPageHolder() const { return *dummy_page_holder_; }
   StyleEngine& GetStyleEngine();
   Element* GetElementById(const char* id) const;
+  AnimationClock& GetAnimationClock();
+  PendingAnimations& GetPendingAnimations();
 
   void UpdateAllLifecyclePhases();
 

third_party/WebKit/Source/core/workers/DedicatedWorkerTest.cpp

@@ -7,7 +7,7 @@
 #include "core/events/MessageEvent.h"
 #include "core/inspector/ConsoleMessageStorage.h"
 #include "core/inspector/ThreadDebugger.h"
-#include "core/testing/DummyPageHolder.h"
+#include "core/testing/PageTestBase.h"
 #include "core/workers/DedicatedWorkerGlobalScope.h"
 #include "core/workers/DedicatedWorkerMessagingProxy.h"
 #include "core/workers/DedicatedWorkerObjectProxy.h"
@@ -169,14 +169,14 @@ class DedicatedWorkerMessagingProxyForTest
   scoped_refptr<SecurityOrigin> security_origin_;
 };
 
-class DedicatedWorkerTest : public ::testing::Test {
+class DedicatedWorkerTest : public PageTestBase {
  public:
   DedicatedWorkerTest() {}
 
   void SetUp() override {
-    page_ = DummyPageHolder::Create();
+    PageTestBase::SetUp(IntSize());
     worker_messaging_proxy_ =
-        new DedicatedWorkerMessagingProxyForTest(&page_->GetDocument());
+        new DedicatedWorkerMessagingProxyForTest(&GetDocument());
   }
 
   void TearDown() override {
@@ -198,10 +198,7 @@ class DedicatedWorkerTest : public ::testing::Test {
     return worker_messaging_proxy_->GetDedicatedWorkerThread();
   }
 
-  Document& GetDocument() { return page_->GetDocument(); }
-
  private:
-  std::unique_ptr<DummyPageHolder> page_;
   Persistent<DedicatedWorkerMessagingProxyForTest> worker_messaging_proxy_;
 };