1 files changed, 27 insertions, 22 deletions

diff --git a/chromium/third_party/blink/renderer/core/layout/layout_geometry_map_test.cc b/chromium/third_party/blink/renderer/core/layout/layout_geometry_map_test.cc
index cfa392065c4..d67642b5243 100644
--- a/chromium/third_party/blink/renderer/core/layout/layout_geometry_map_test.cc
+++ b/chromium/third_party/blink/renderer/core/layout/layout_geometry_map_test.cc
@@ -156,21 +156,26 @@ class LayoutGeometryMapTest : public testing::Test {
   }
 
   void RegisterMockedHttpURLLoad(const std::string& file_name) {
-    URLTestHelpers::RegisterMockedURLLoadFromBase(
+    url_test_helpers::RegisterMockedURLLoadFromBase(
         WebString::FromUTF8(base_url_), test::CoreTestDataPath(),
         WebString::FromUTF8(file_name));
   }
 
+  void UpdateAllLifecyclePhases(WebView* web_view) {
+    web_view->MainFrameWidget()->UpdateAllLifecyclePhases(
+        WebWidget::LifecycleUpdateReason::kTest);
+  }
+
   const std::string base_url_;
 };
 
 TEST_F(LayoutGeometryMapTest, SimpleGeometryMapTest) {
   RegisterMockedHttpURLLoad("rgm_test.html");
-  FrameTestHelpers::WebViewHelper web_view_helper;
+  frame_test_helpers::WebViewHelper web_view_helper;
   WebView* web_view =
       web_view_helper.InitializeAndLoad(base_url_ + "rgm_test.html");
-  web_view->Resize(WebSize(1000, 1000));
-  web_view->UpdateAllLifecyclePhases();
+  web_view->MainFrameWidget()->Resize(WebSize(1000, 1000));
+  UpdateAllLifecyclePhases(web_view);
 
   // We are going test everything twice. Once with FloatPoints and once with
   // FloatRects. This is because LayoutGeometryMap treats both slightly
@@ -210,11 +215,11 @@ TEST_F(LayoutGeometryMapTest, TransformedGeometryTest)
 #endif
 {
   RegisterMockedHttpURLLoad("rgm_transformed_test.html");
-  FrameTestHelpers::WebViewHelper web_view_helper;
+  frame_test_helpers::WebViewHelper web_view_helper;
   WebView* web_view = web_view_helper.InitializeAndLoad(
       base_url_ + "rgm_transformed_test.html");
-  web_view->Resize(WebSize(1000, 1000));
-  web_view->UpdateAllLifecyclePhases();
+  web_view->MainFrameWidget()->Resize(WebSize(1000, 1000));
+  UpdateAllLifecyclePhases(web_view);
 
   LayoutGeometryMap rgm;
   rgm.PushMappingsToAncestor(GetLayoutBox(web_view, "InitialDiv"), nullptr);
@@ -269,11 +274,11 @@ TEST_F(LayoutGeometryMapTest, TransformedGeometryTest)
 
 TEST_F(LayoutGeometryMapTest, FixedGeometryTest) {
   RegisterMockedHttpURLLoad("rgm_fixed_position_test.html");
-  FrameTestHelpers::WebViewHelper web_view_helper;
+  frame_test_helpers::WebViewHelper web_view_helper;
   WebView* web_view = web_view_helper.InitializeAndLoad(
       base_url_ + "rgm_fixed_position_test.html");
-  web_view->Resize(WebSize(1000, 1000));
-  web_view->UpdateAllLifecyclePhases();
+  web_view->MainFrameWidget()->Resize(WebSize(1000, 1000));
+  UpdateAllLifecyclePhases(web_view);
 
   LayoutGeometryMap rgm;
   rgm.PushMappingsToAncestor(GetLayoutBox(web_view, "InitialDiv"), nullptr);
@@ -307,11 +312,11 @@ TEST_F(LayoutGeometryMapTest, FixedGeometryTest) {
 
 TEST_F(LayoutGeometryMapTest, ContainsFixedPositionTest) {
   RegisterMockedHttpURLLoad("rgm_contains_fixed_position_test.html");
-  FrameTestHelpers::WebViewHelper web_view_helper;
+  frame_test_helpers::WebViewHelper web_view_helper;
   WebView* web_view = web_view_helper.InitializeAndLoad(
       base_url_ + "rgm_contains_fixed_position_test.html");
-  web_view->Resize(WebSize(1000, 1000));
-  web_view->UpdateAllLifecyclePhases();
+  web_view->MainFrameWidget()->Resize(WebSize(1000, 1000));
+  UpdateAllLifecyclePhases(web_view);
 
   FloatRect rect(0.0f, 0.0f, 100.0f, 100.0f);
   LayoutGeometryMap rgm;
@@ -355,11 +360,11 @@ TEST_F(LayoutGeometryMapTest, ContainsFixedPositionTest) {
 TEST_F(LayoutGeometryMapTest, IframeTest) {
   RegisterMockedHttpURLLoad("rgm_iframe_test.html");
   RegisterMockedHttpURLLoad("rgm_test.html");
-  FrameTestHelpers::WebViewHelper web_view_helper;
+  frame_test_helpers::WebViewHelper web_view_helper;
   WebView* web_view =
       web_view_helper.InitializeAndLoad(base_url_ + "rgm_iframe_test.html");
-  web_view->Resize(WebSize(1000, 1000));
-  web_view->UpdateAllLifecyclePhases();
+  web_view->MainFrameWidget()->Resize(WebSize(1000, 1000));
+  UpdateAllLifecyclePhases(web_view);
 
   LayoutGeometryMap rgm(kTraverseDocumentBoundaries);
   LayoutGeometryMap rgm_no_frame;
@@ -451,11 +456,11 @@ TEST_F(LayoutGeometryMapTest, IframeTest) {
 
 TEST_F(LayoutGeometryMapTest, ColumnTest) {
   RegisterMockedHttpURLLoad("rgm_column_test.html");
-  FrameTestHelpers::WebViewHelper web_view_helper;
+  frame_test_helpers::WebViewHelper web_view_helper;
   WebView* web_view =
       web_view_helper.InitializeAndLoad(base_url_ + "rgm_column_test.html");
-  web_view->Resize(WebSize(1000, 1000));
-  web_view->UpdateAllLifecyclePhases();
+  web_view->MainFrameWidget()->Resize(WebSize(1000, 1000));
+  UpdateAllLifecyclePhases(web_view);
 
   // The document is 1000f wide (we resized to that size).
   // We have a 8px margin on either side of the document.
@@ -499,11 +504,11 @@ TEST_F(LayoutGeometryMapTest, ColumnTest) {
 
 TEST_F(LayoutGeometryMapTest, FloatUnderInlineLayer) {
   RegisterMockedHttpURLLoad("rgm_float_under_inline.html");
-  FrameTestHelpers::WebViewHelper web_view_helper;
+  frame_test_helpers::WebViewHelper web_view_helper;
   WebView* web_view = web_view_helper.InitializeAndLoad(
       base_url_ + "rgm_float_under_inline.html");
-  web_view->Resize(WebSize(1000, 1000));
-  web_view->UpdateAllLifecyclePhases();
+  web_view->MainFrameWidget()->Resize(WebSize(1000, 1000));
+  UpdateAllLifecyclePhases(web_view);
 
   LayoutGeometryMap rgm;
   auto* layer_under_float = GetLayoutBox(web_view, "layer-under-float");