Refactor the way PaintArtifactCompositor is attached and used.

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

Index: third_party/WebKit/Source/core/frame/FrameViewTest.cpp
diff --git a/third_party/WebKit/Source/core/frame/FrameViewTest.cpp b/third_party/WebKit/Source/core/frame/FrameViewTest.cpp
index 9993a404f13f7b73e6639e461f427d2feee15ff7..8c9670bb411a738f8e781bddd151840433e4e218 100644
--- a/third_party/WebKit/Source/core/frame/FrameViewTest.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameViewTest.cpp
@@ -31,7 +31,6 @@ public:
     MockChromeClient() : m_hasScheduledAnimation(false) { }
 
     // ChromeClient
-    MOCK_METHOD1(didPaint, void(const PaintArtifact&));
     MOCK_METHOD2(attachRootGraphicsLayer, void(GraphicsLayer*, LocalFrame* localRoot));
     MOCK_METHOD2(setToolTip, void(const String&, TextDirection));
 
@@ -108,25 +107,6 @@ private:
 INSTANTIATE_TEST_CASE_P(All, FrameViewTest, ::testing::Bool());
 INSTANTIATE_TEST_CASE_P(All, FrameViewSlimmingPaintV2Test, ::testing::Bool());
 
-// These tests ensure that FrameView informs the ChromeClient of changes to the
-// paint artifact so that they can be shown to the user (e.g. via the
-// compositor).
-TEST_P(FrameViewSlimmingPaintV2Test, PaintOnce)
-{
-    EXPECT_CALL(chromeClient(), didPaint(_));
-    document().body()->setInnerHTML("Hello world", ASSERT_NO_EXCEPTION);
-    document().view()->updateAllLifecyclePhases();
-}
-
-TEST_P(FrameViewSlimmingPaintV2Test, PaintAndRepaint)
-{
-    EXPECT_CALL(chromeClient(), didPaint(_)).Times(2);
-    document().body()->setInnerHTML("Hello", ASSERT_NO_EXCEPTION);
-    document().view()->updateAllLifecyclePhases();
-    document().body()->setInnerHTML("Hello world", ASSERT_NO_EXCEPTION);
-    document().view()->updateAllLifecyclePhases();
-}
-
 TEST_P(FrameViewTest, SetPaintInvalidationDuringUpdateAllLifecyclePhases)
 {
     document().body()->setInnerHTML("<div id='a' style='color: blue'>A</div>", ASSERT_NO_EXCEPTION);