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

third_party/WebKit/Source/core/editing/InputMethodControllerTest.cpp

 // Copyright 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 "core/editing/InputMethodController.h"
 
 #include "core/dom/Element.h"
 #include "core/dom/Range.h"
 #include "core/editing/FrameSelection.h"
 #include "core/events/MouseEvent.h"
@@ skipping 25 matching lines @@
 {
     m_dummyPageHolder = DummyPageHolder::create(IntSize(800, 600));
     m_document = toHTMLDocument(&m_dummyPageHolder->document());
     DCHECK(m_document);
 }
 
 Element* InputMethodControllerTest::insertHTMLElement(
     const char* elementCode, const char* elementId)
 {
     document().write(elementCode);
-    document().updateLayout();
+    document().updateStyleAndLayout();
     Element* element = document().getElementById(elementId);
     element->focus();
     return element;
 }
 
 TEST_F(InputMethodControllerTest, BackspaceFromEndOfInput)
 {
     HTMLInputElement* input = toHTMLInputElement(
         insertHTMLElement("<input id='sample'>", "sample"));
 
@@ skipping 312 matching lines @@
     document().setTitle(emptyString());
     controller().setComposition("foo", underlines, 0, 3);
     EXPECT_STREQ("beforeinput.isComposing:true", document().title().utf8().data());
 
     document().setTitle(emptyString());
     controller().confirmComposition();
     EXPECT_STREQ("beforeinput.isComposing:false", document().title().utf8().data());
 }
 
 } // namespace blink