Make CaretBase a DisplayItemClient.

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

Index: third_party/WebKit/Source/core/paint/PaintControllerPaintTest.cpp
diff --git a/third_party/WebKit/Source/core/paint/PaintControllerPaintTest.cpp b/third_party/WebKit/Source/core/paint/PaintControllerPaintTest.cpp
index 861bc87882da27ffeb8d8effece54325ef023634..1d31b29059cbca79238cbcdedee7b78d670336a4 100644
--- a/third_party/WebKit/Source/core/paint/PaintControllerPaintTest.cpp
+++ b/third_party/WebKit/Source/core/paint/PaintControllerPaintTest.cpp
@@ -4,6 +4,8 @@
 
 #include "core/paint/PaintControllerPaintTest.h"
 
+#include "core/editing/FrameCaret.h"
+#include "core/editing/FrameSelection.h"
 #include "core/layout/LayoutText.h"
 #include "core/layout/line/InlineTextBox.h"
 #include "core/page/FocusController.h"
@@ -23,7 +25,6 @@ TEST_P(PaintControllerPaintTestForSlimmingPaintV1AndV2, FullDocumentPaintingWith
     document().page()->focusController().setActive(true);
     document().page()->focusController().setFocused(true);
     Element& div = *toElement(document().body()->firstChild());
-    LayoutObject& divLayoutObject = *document().body()->firstChild()->layoutObject();
     InlineTextBox& textInlineBox = *toLayoutText(div.firstChild()->layoutObject())->firstTextBox();
 
     EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 2,
@@ -36,7 +37,7 @@ TEST_P(PaintControllerPaintTestForSlimmingPaintV1AndV2, FullDocumentPaintingWith
     EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 3,
         TestDisplayItem(layoutView(), documentBackgroundType),
         TestDisplayItem(textInlineBox, foregroundType),
-        TestDisplayItem(divLayoutObject, DisplayItem::Caret)); // New!
+        TestDisplayItem(*document().frame()->selection().m_frameCaret, DisplayItem::Caret)); // New!
 }
 
 TEST_P(PaintControllerPaintTestForSlimmingPaintV1AndV2, InlineRelayout)