Unify test classes to use PageTestBase

Bug: 771800
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2
Change-Id: I710238913e0400c1eabb24351116ab445c79739a
Reviewed-on: https://chromium-review.googlesource.com/821812Reviewed-by: Koji Ishii <kojii@chromium.org>
Commit-Queue: Shanmuga Pandi <shanmuga.m@samsung.com>
Cr-Commit-Position: refs/heads/master@{#523405}

third_party/WebKit/Source/core/dom/FlatTreeTraversalTest.cpp

@@ -13,7 +13,7 @@
 #include "core/dom/ShadowRoot.h"
 #include "core/frame/LocalFrameView.h"
 #include "core/html/HTMLElement.h"
-#include "core/testing/DummyPageHolder.h"
+#include "core/testing/PageTestBase.h"
 #include "platform/geometry/IntSize.h"
 #include "platform/wtf/Compiler.h"
 #include "platform/wtf/StdLibExtras.h"
@@ -22,10 +22,8 @@
 
 namespace blink {
 
-class FlatTreeTraversalTest : public ::testing::Test {
+class FlatTreeTraversalTest : public PageTestBase {
  protected:
-  Document& GetDocument() const;
-
   // Sets |mainHTML| to BODY element with |innerHTML| property and attaches
   // shadow root to child with |shadowHTML|, then update distribution for
   // calling member functions in |FlatTreeTraversal|.
@@ -38,24 +36,8 @@ class FlatTreeTraversalTest : public ::testing::Test {
   void AttachV0ShadowRoot(Element& shadow_host, const char* shadow_inner_html);
   void AttachOpenShadowRoot(Element& shadow_host,
                             const char* shadow_inner_html);
-
- private:
-  void SetUp() override;
-
-  Persistent<Document> document_;
-  std::unique_ptr<DummyPageHolder> dummy_page_holder_;
 };
 
-void FlatTreeTraversalTest::SetUp() {
-  dummy_page_holder_ = DummyPageHolder::Create(IntSize(800, 600));
-  document_ = &dummy_page_holder_->GetDocument();
-  DCHECK(document_);
-}
-
-Document& FlatTreeTraversalTest::GetDocument() const {
-  return *document_;
-}
-
 void FlatTreeTraversalTest::SetupSampleHTML(const char* main_html,
                                             const char* shadow_html,
                                             unsigned index) {

third_party/WebKit/Source/core/dom/ng/flat_tree_traversal_ng_test.cc

@@ -13,7 +13,7 @@
 #include "core/dom/ShadowRoot.h"
 #include "core/frame/LocalFrameView.h"
 #include "core/html/HTMLElement.h"
-#include "core/testing/DummyPageHolder.h"
+#include "core/testing/PageTestBase.h"
 #include "platform/geometry/IntSize.h"
 #include "platform/runtime_enabled_features.h"
 #include "platform/testing/RuntimeEnabledFeaturesTestHelpers.h"
@@ -26,14 +26,12 @@ namespace blink {
 // To avoid symbol collisions in jumbo builds.
 namespace flat_tree_traversal_ng_test {
 
-class FlatTreeTraversalNgTest : public ::testing::Test,
+class FlatTreeTraversalNgTest : public PageTestBase,
                                 private ScopedIncrementalShadowDOMForTest {
  public:
   FlatTreeTraversalNgTest() : ScopedIncrementalShadowDOMForTest(true) {}
 
  protected:
-  Document& GetDocument() const;
-
   // Sets |mainHTML| to BODY element with |innerHTML| property and attaches
   // shadow root to child with |shadowHTML|, then update distribution for
   // calling member functions in |FlatTreeTraversalNg|.
@@ -46,24 +44,8 @@ class FlatTreeTraversalNgTest : public ::testing::Test,
   void AttachV0ShadowRoot(Element& shadow_host, const char* shadow_inner_html);
   void AttachOpenShadowRoot(Element& shadow_host,
                             const char* shadow_inner_html);
-
- private:
-  void SetUp() override;
-
-  Persistent<Document> document_;
-  std::unique_ptr<DummyPageHolder> dummy_page_holder_;
 };
 
-void FlatTreeTraversalNgTest::SetUp() {
-  dummy_page_holder_ = DummyPageHolder::Create(IntSize(800, 600));
-  document_ = &dummy_page_holder_->GetDocument();
-  DCHECK(document_);
-}
-
-Document& FlatTreeTraversalNgTest::GetDocument() const {
-  return *document_;
-}
-
 void FlatTreeTraversalNgTest::SetupSampleHTML(const char* main_html,
                                               const char* shadow_html,
                                               unsigned index) {

third_party/WebKit/Source/core/frame/FrameTest.cpp

@@ -5,16 +5,16 @@
 #include "core/frame/Frame.h"
 
 #include "core/dom/UserGestureIndicator.h"
-#include "core/testing/DummyPageHolder.h"
+#include "core/testing/PageTestBase.h"
 #include "platform/testing/UnitTestHelpers.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace blink {
 
-class FrameTest : public ::testing::Test {
+class FrameTest : public PageTestBase {
  public:
   void SetUp() override {
-    dummy_page_holder_ = DummyPageHolder::Create(IntSize(800, 600));
+    PageTestBase::SetUp();
     Navigate("https://example.com/");
 
     ASSERT_FALSE(GetDocument().GetFrame()->HasBeenActivated());
@@ -22,8 +22,6 @@ class FrameTest : public ::testing::Test {
         GetDocument().GetFrame()->HasReceivedUserGestureBeforeNavigation());
   }
 
-  Document& GetDocument() const { return dummy_page_holder_->GetDocument(); }
-
   void Navigate(const String& destinationUrl) {
     const KURL& url = KURL(NullURL(), destinationUrl);
     FrameLoadRequest request(nullptr, ResourceRequest(url),
@@ -38,9 +36,6 @@ class FrameTest : public ::testing::Test {
   }
 
   void NavigateDifferentDomain() { Navigate("https://example.org/"); }
-
- private:
-  std::unique_ptr<DummyPageHolder> dummy_page_holder_;
 };
 
 TEST_F(FrameTest, NoGesture) {

third_party/WebKit/Source/core/html/HTMLEmbedElementTest.cpp

@@ -9,36 +9,12 @@
 #include "core/frame/LocalFrameView.h"
 #include "core/html/HTMLObjectElement.h"
 #include "core/style/ComputedStyle.h"
-#include "core/testing/DummyPageHolder.h"
+#include "core/testing/PageTestBase.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace blink {
 
-class HTMLEmbedElementTest : public ::testing::Test {
- protected:
-  HTMLEmbedElementTest() {}
-
-  void SetUp() override;
-
-  Document& GetDocument() const { return *document_; }
-
-  void SetHtmlInnerHTML(const char* html_content);
-
-  std::unique_ptr<DummyPageHolder> dummy_page_holder_;
-  Persistent<Document> document_;
-};
-
-void HTMLEmbedElementTest::SetUp() {
-  dummy_page_holder_ = DummyPageHolder::Create(IntSize(800, 600));
-  document_ = &dummy_page_holder_->GetDocument();
-  DCHECK(document_);
-}
-
-void HTMLEmbedElementTest::SetHtmlInnerHTML(const char* html_content) {
-  GetDocument().documentElement()->SetInnerHTMLFromString(
-      String::FromUTF8(html_content));
-  GetDocument().View()->UpdateAllLifecyclePhases();
-}
+class HTMLEmbedElementTest : public PageTestBase {};
 
 TEST_F(HTMLEmbedElementTest, FallbackState) {
   // Load <object> element with a <embed> child.
@@ -55,7 +31,7 @@ TEST_F(HTMLEmbedElementTest, FallbackState) {
     </object></div>
   )HTML");
 
-  auto* object_element = GetDocument().getElementById("fco");
+  auto* object_element = GetElementById("fco");
   ASSERT_TRUE(object_element);
   HTMLObjectElement* object = ToHTMLObjectElement(object_element);
 
@@ -66,11 +42,11 @@ TEST_F(HTMLEmbedElementTest, FallbackState) {
   EXPECT_FALSE(object->UseFallbackContent());
   EXPECT_TRUE(object->WillUseFallbackContentAtLayout());
 
-  auto* embed_element = GetDocument().getElementById("fce");
+  auto* embed_element = GetElementById("fce");
   ASSERT_TRUE(embed_element);
   HTMLEmbedElement* embed = ToHTMLEmbedElement(embed_element);
 
-  GetDocument().View()->UpdateAllLifecyclePhases();
+  UpdateAllLifecyclePhases();
 
   // We should get |true| as a result and don't trigger a DCHECK.
   EXPECT_TRUE(static_cast<Element*>(embed)->LayoutObjectIsNeeded(
@@ -83,7 +59,7 @@ TEST_F(HTMLEmbedElementTest, FallbackState) {
   EXPECT_TRUE(object->UseFallbackContent());
   EXPECT_TRUE(object->WillUseFallbackContentAtLayout());
 
-  GetDocument().View()->UpdateAllLifecyclePhases();
+  UpdateAllLifecyclePhases();
   EXPECT_TRUE(static_cast<Element*>(embed)->LayoutObjectIsNeeded(
       ComputedStyle::InitialStyle()));
 }

third_party/WebKit/Source/core/html/parser/HTMLDocumentParserTest.cpp

@@ -4,13 +4,13 @@
 
 #include "core/html/parser/HTMLDocumentParser.h"
 
+#include <memory>
 #include "core/html/HTMLDocument.h"
 #include "core/html/parser/TextResourceDecoder.h"
 #include "core/loader/PrerendererClient.h"
 #include "core/loader/TextResourceDecoderBuilder.h"
-#include "core/testing/DummyPageHolder.h"
+#include "core/testing/PageTestBase.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include <memory>
 
 namespace blink {
 
@@ -28,10 +28,11 @@ class TestPrerendererClient : public PrerendererClient {
   bool is_prefetch_only_;
 };
 
-class HTMLDocumentParserTest : public ::testing::Test {
+class HTMLDocumentParserTest : public PageTestBase {
  protected:
-  HTMLDocumentParserTest() : dummy_page_holder_(DummyPageHolder::Create()) {
-    dummy_page_holder_->GetDocument().SetURL(KURL("https://example.test"));
+  void SetUp() override {
+    PageTestBase::SetUp();
+    GetDocument().SetURL(KURL("https://example.test"));
   }
 
   HTMLDocumentParser* CreateParser(HTMLDocument& document) {
@@ -42,14 +43,12 @@ class HTMLDocumentParserTest : public ::testing::Test {
     parser->SetDecoder(std::move(decoder));
     return parser;
   }
-
-  std::unique_ptr<DummyPageHolder> dummy_page_holder_;
 };
 
 }  // namespace
 
 TEST_F(HTMLDocumentParserTest, AppendPrefetch) {
-  HTMLDocument& document = ToHTMLDocument(dummy_page_holder_->GetDocument());
+  HTMLDocument& document = ToHTMLDocument(GetDocument());
   ProvidePrerendererClientTo(
       *document.GetPage(),
       new TestPrerendererClient(*document.GetPage(), true));
@@ -66,7 +65,7 @@ TEST_F(HTMLDocumentParserTest, AppendPrefetch) {
 }
 
 TEST_F(HTMLDocumentParserTest, AppendNoPrefetch) {
-  HTMLDocument& document = ToHTMLDocument(dummy_page_holder_->GetDocument());
+  HTMLDocument& document = ToHTMLDocument(GetDocument());
   EXPECT_FALSE(document.IsPrefetchOnly());
   // Use ForceSynchronousParsing to allow calling append().
   HTMLDocumentParser* parser = CreateParser(document);

third_party/WebKit/Source/core/page/FocusControllerTest.cpp

@@ -8,23 +8,14 @@
 #include "bindings/core/v8/V8BindingForCore.h"
 #include "core/dom/ShadowRootInit.h"
 #include "core/html/HTMLElement.h"
-#include "core/testing/DummyPageHolder.h"
+#include "core/testing/PageTestBase.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace blink {
 
-class FocusControllerTest : public ::testing::Test {
- public:
-  Document& GetDocument() const { return page_holder_->GetDocument(); }
-  FocusController& GetFocusController() const {
-    return GetDocument().GetPage()->GetFocusController();
-  }
-  DummyPageHolder* PageHolder() const { return page_holder_.get(); }
-
+class FocusControllerTest : public PageTestBase {
  private:
-  void SetUp() override { page_holder_ = DummyPageHolder::Create(); }
-
-  std::unique_ptr<DummyPageHolder> page_holder_;
+  void SetUp() override { PageTestBase::SetUp(IntSize()); }
 };
 
 TEST_F(FocusControllerTest, SetInitialFocus) {
@@ -91,7 +82,7 @@ TEST_F(FocusControllerTest, SetActiveOnInactiveDocument) {
   // Document::shutdown() detaches document from its frame, and thus
   // document().page() becomes nullptr.
   // Use DummyPageHolder's page to retrieve FocusController.
-  PageHolder()->GetPage().GetFocusController().SetActive(true);
+  GetPage().GetFocusController().SetActive(true);
 }
 
 // This test is for crbug.com/733218

third_party/WebKit/Source/core/paint/FirstMeaningfulPaintDetectorTest.cpp

@@ -6,7 +6,7 @@
 
 #include "core/paint/PaintEvent.h"
 #include "core/paint/PaintTiming.h"
-#include "core/testing/DummyPageHolder.h"
+#include "core/testing/PageTestBase.h"
 #include "platform/testing/TestingPlatformSupportWithMockScheduler.h"
 #include "platform/wtf/text/StringBuilder.h"
 #include "public/platform/WebLayerTreeView.h"
@@ -14,11 +14,11 @@
 
 namespace blink {
 
-class FirstMeaningfulPaintDetectorTest : public ::testing::Test {
+class FirstMeaningfulPaintDetectorTest : public PageTestBase {
  protected:
   void SetUp() override {
     platform_->AdvanceClockSeconds(1);
-    dummy_page_holder_ = DummyPageHolder::Create(IntSize(800, 600));
+    PageTestBase::SetUp();
   }
 
   double AdvanceClockAndGetTime() {
@@ -26,7 +26,6 @@ class FirstMeaningfulPaintDetectorTest : public ::testing::Test {
     return MonotonicallyIncreasingTime();
   }
 
-  Document& GetDocument() { return dummy_page_holder_->GetDocument(); }
   PaintTiming& GetPaintTiming() { return PaintTiming::From(GetDocument()); }
   FirstMeaningfulPaintDetector& Detector() {
     return GetPaintTiming().GetFirstMeaningfulPaintDetector();
@@ -123,9 +122,6 @@ class FirstMeaningfulPaintDetectorTest : public ::testing::Test {
       FirstMeaningfulPaintDetector::kNetwork0QuietWindowSeconds;
   static constexpr double kNetwork2QuietWindowSeconds =
       FirstMeaningfulPaintDetector::kNetwork2QuietWindowSeconds;
-
- private:
-  std::unique_ptr<DummyPageHolder> dummy_page_holder_;
 };
 
 TEST_F(FirstMeaningfulPaintDetectorTest, NoFirstPaint) {

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

@@ -79,8 +79,8 @@ void PageTestBase::LoadAhem(LocalFrame& frame) {
 }
 
 // Both sets the inner html and runs the document lifecycle.
-void PageTestBase::SetBodyInnerHTML(const String& html_content) {
-  GetDocument().body()->SetInnerHTMLFromString(html_content,
+void PageTestBase::SetBodyInnerHTML(const String& body_content) {
+  GetDocument().body()->SetInnerHTMLFromString(body_content,
                                                ASSERT_NO_EXCEPTION);
   UpdateAllLifecyclePhases();
 }
@@ -89,6 +89,12 @@ void PageTestBase::SetBodyContent(const std::string& body_content) {
   SetBodyInnerHTML(String::FromUTF8(body_content.c_str()));
 }
 
+void PageTestBase::SetHtmlInnerHTML(const std::string& html_content) {
+  GetDocument().documentElement()->SetInnerHTMLFromString(
+      String::FromUTF8(html_content.c_str()));
+  GetDocument().View()->UpdateAllLifecyclePhases();
+}
+
 void PageTestBase::UpdateAllLifecyclePhases() {
   GetDocument().View()->UpdateAllLifecyclePhases();
 }
@@ -109,4 +115,8 @@ PendingAnimations& PageTestBase::GetPendingAnimations() {
   return GetDocument().GetPendingAnimations();
 }
 
+FocusController& PageTestBase::GetFocusController() const {
+  return GetDocument().GetPage()->GetFocusController();
+}
+
 }  // namespace blink

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

@@ -30,6 +30,7 @@ class PageTestBase : public ::testing::Test {
   // TODO(shanmuga.m@samsung.com): These two function to be unified.
   void SetBodyContent(const std::string&);
   void SetBodyInnerHTML(const String&);
+  void SetHtmlInnerHTML(const std::string&);
 
   Document& GetDocument() const;
   Page& GetPage() const;
@@ -40,6 +41,7 @@ class PageTestBase : public ::testing::Test {
   Element* GetElementById(const char* id) const;
   AnimationClock& GetAnimationClock();
   PendingAnimations& GetPendingAnimations();
+  FocusController& GetFocusController() const;
 
   void UpdateAllLifecyclePhases();