Rename (updateLayout/updateStyle).*.() to updateStyleAndLayout.*.()

third_party/WebKit/Source/web/ExternalPopupMenuTest.cpp

 // Copyright (c) 2014 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 "web/ExternalPopupMenu.h"
 
 #include "core/HTMLNames.h"
 #include "core/dom/NodeComputedStyle.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/VisualViewport.h"
@@ skipping 21 matching lines @@
 
 protected:
     void SetUp() override
     {
         m_dummyPageHolder = DummyPageHolder::create(IntSize(800, 600));
         HTMLSelectElement* element = HTMLSelectElement::create(m_dummyPageHolder->document());
         // Set the 4th an 5th items to have "display: none" property
         element->setInnerHTML("<option><option><option><option style='display:none;'><option style='display:none;'><option><option>", ASSERT_NO_EXCEPTION);
         m_dummyPageHolder->document().body()->appendChild(element, ASSERT_NO_EXCEPTION);
         m_ownerElement = element;
-        m_dummyPageHolder->document().updateLayoutIgnorePendingStylesheets();
+        m_dummyPageHolder->document().updateStyleAndLayoutIgnorePendingStylesheets();
     }
 
     OwnPtr<DummyPageHolder> m_dummyPageHolder;
     Persistent<HTMLSelectElement> m_ownerElement;
 };
 
 TEST_F(ExternalPopupMenuDisplayNoneItemsTest, PopupMenuInfoSizeTest)
 {
     WebPopupMenuInfo info;
     ExternalPopupMenu::getPopupMenuInfo(info, *m_ownerElement);
@@ skipping 161 matching lines @@
     ASSERT_TRUE(select->popupIsVisible());
 
     WebExternalPopupMenuClient* client = static_cast<ExternalPopupMenu*>(select->popup());
     WebVector<int> indices;
     client->didAcceptIndices(indices);
     EXPECT_FALSE(select->popupIsVisible());
     EXPECT_EQ(-1, select->selectedIndex());
 }
 
 } // namespace blink