Remove non-layer-list codepath from PaintArtifactCompositor

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/paint/VideoPainter.h"
 
 #include "core/frame/FrameView.h"
 #include "core/frame/Settings.h"
 #include "core/html/HTMLMediaElement.h"
 #include "core/loader/EmptyClients.h"
@@ skipping 67 matching lines @@
 
 class StubFrameLoaderClient : public EmptyFrameLoaderClient {
 public:
     // FrameLoaderClient
     std::unique_ptr<WebMediaPlayer> createWebMediaPlayer(HTMLMediaElement&, const WebMediaPlayerSource&, WebMediaPlayerClient* client) override
     {
         return wrapUnique(new StubWebMediaPlayer(client));
     }
 };
 
-class VideoPainterTestForSPv2 : public ::testing::TestWithParam<WebLayerTreeViewImplForTesting::LayerListPolicy> {
+class VideoPainterTestForSPv2 : public ::testing::Test {
 protected:
     void SetUp() override
     {
         RuntimeEnabledFeatures::setSlimmingPaintV2Enabled(true);
-        m_chromeClient = new StubChromeClientForSPv2(GetParam());
+        m_chromeClient = new StubChromeClientForSPv2();
         m_frameLoaderClient = new StubFrameLoaderClient;
         Page::PageClients clients;
         fillWithEmptyClients(clients);
         clients.chromeClient = m_chromeClient.get();
         m_pageHolder = DummyPageHolder::create(IntSize(800, 600), &clients, m_frameLoaderClient.get(),
             [](Settings& settings) { settings.setAcceleratedCompositingEnabled(true); });
         document().view()->setParentVisible(true);
         document().view()->setSelfVisible(true);
         document().setURL(KURL(KURL(), "https://example.com/"));
     }
 
     void TearDown() override
     {
         m_featuresBackup.restore();
     }
 
     Document& document() { return m_pageHolder->document(); }
     bool hasLayerAttached(const WebLayer& layer) { return m_chromeClient->hasLayer(layer); }
 
 private:
     RuntimeEnabledFeatures::Backup m_featuresBackup;
     Persistent<StubChromeClientForSPv2> m_chromeClient;
     Persistent<StubFrameLoaderClient> m_frameLoaderClient;
     std::unique_ptr<DummyPageHolder> m_pageHolder;
 };
 
-INSTANTIATE_TEST_CASE_P(, VideoPainterTestForSPv2, ::testing::Values(
-    WebLayerTreeViewImplForTesting::DontUseLayerLists,
-    WebLayerTreeViewImplForTesting::UseLayerLists));
-
-TEST_P(VideoPainterTestForSPv2, VideoLayerAppearsInLayerTree)
+TEST_F(VideoPainterTestForSPv2, VideoLayerAppearsInLayerTree)
 {
     // Insert a <video> and allow it to begin loading.
     document().body()->setInnerHTML("<video width=300 height=200 src=test.ogv>", ASSERT_NO_EXCEPTION);
     testing::runPendingTasks();
 
     // Force the page to paint.
     document().view()->updateAllLifecyclePhases();
 
     // Fetch the layer associated with the <video>, and check that it was
     // correctly configured in the layer tree.
     HTMLMediaElement* element = toHTMLMediaElement(document().body()->firstChild());
     StubWebMediaPlayer* player = static_cast<StubWebMediaPlayer*>(element->webMediaPlayer());
     const WebLayer* layer = player->getWebLayer();
     ASSERT_TRUE(layer);
     EXPECT_TRUE(hasLayerAttached(*layer));
     EXPECT_EQ(WebSize(300, 200), layer->bounds());
 }
 
 } // namespace
 } // namespace blink