Merge back LayoutLayerModelObject into RenderBoxModelObject

Source/web/tests/LayoutGeometryMapTest.cpp

Index: Source/web/tests/LayoutGeometryMapTest.cpp
diff --git a/Source/web/tests/LayoutGeometryMapTest.cpp b/Source/web/tests/LayoutGeometryMapTest.cpp
index eda15b0f298e11bdb3ccc2f20625361bae8e7a52..40a06090e2f5a923e7a1138b1b9efea9285f3b0e 100644
--- a/Source/web/tests/LayoutGeometryMapTest.cpp
+++ b/Source/web/tests/LayoutGeometryMapTest.cpp
@@ -90,7 +90,7 @@ protected:
         return element->renderBox();
     }
 
-    static const LayoutLayerModelObject* getRenderContainer(WebView* webView, const WTF::AtomicString &elementId)
+    static const LayoutBoxModelObject* getRenderContainer(WebView* webView, const WTF::AtomicString &elementId)
     {
         RenderBox* rb = getRenderBox(webView, elementId);
         if (!rb)
@@ -101,7 +101,7 @@ protected:
         return compositingLayer->renderer();
     }
 
-    static const LayoutLayerModelObject* getFrameRenderContainer(const char* frameId, WebView* webView, const WTF::AtomicString &elementId)
+    static const LayoutBoxModelObject* getFrameRenderContainer(const char* frameId, WebView* webView, const WTF::AtomicString &elementId)
     {
         RenderBox* rb = getFrameElement(frameId, webView, elementId);
         if (!rb)