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

third_party/WebKit/Source/web/tests/WebDocumentTest.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 "public/web/WebDocument.h"
 
 #include "core/CSSPropertyNames.h"
 #include "core/HTMLNames.h"
 #include "core/dom/NodeComputedStyle.h"
 #include "core/dom/StyleEngine.h"
@@ skipping 66 matching lines @@
 
     HTMLElement* bodyElement = coreDoc->body();
     DCHECK(bodyElement);
 
     const ComputedStyle& styleBeforeInsertion = bodyElement->computedStyleRef();
 
     // Inserted stylesheet not yet applied.
     ASSERT_EQ(Color(0, 0, 0), styleBeforeInsertion.visitedDependentColor(CSSPropertyColor));
 
     // Apply inserted stylesheet.
-    coreDoc->updateLayoutTree();
+    coreDoc->updateStyleAndLayoutTree();
 
     const ComputedStyle& styleAfterInsertion = bodyElement->computedStyleRef();
 
     // Inserted stylesheet applied.
     ASSERT_EQ(Color(0, 128, 0), styleAfterInsertion.visitedDependentColor(CSSPropertyColor));
 }
 
 TEST_F(WebDocumentTest, ManifestURL)
 {
     loadURL(std::string(kDefaultOrigin) + kManifestDummyFilePath);
@@ skipping 222 matching lines @@
     load(nestedOriginAInOriginB);
 
     SchemeRegistry::registerURLSchemeAsFirstPartyWhenTopLevel("http");
 
     ASSERT_EQ(toOriginA(nestedOriginAInOriginB), topDocument()->firstPartyForCookies());
     ASSERT_EQ(toOriginA(nestedOriginAInOriginB), nestedDocument()->firstPartyForCookies());
     ASSERT_EQ(toOriginA(nestedOriginAInOriginB), nestedNestedDocument()->firstPartyForCookies());
 }
 
 } // namespace blink