Rename enums/functions that collide in chromium style in core/layout/.

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

 // Copyright 2015 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/VisibleUnits.h"
 
 #include "core/dom/Text.h"
 #include "core/editing/EditingTestBase.h"
 #include "core/editing/VisiblePosition.h"
 #include "core/html/HTMLTextFormControlElement.h"
@@ skipping 24 matching lines @@
 {
     return createVisiblePosition(PositionInFlatTree(&anchor, offset), affinity);
 }
 
 } // namespace
 
 std::ostream& operator<<(std::ostream& ostream, const InlineBoxPosition& inlineBoxPosition)
 {
     if (!inlineBoxPosition.inlineBox)
         return ostream << "null";
-    return ostream << inlineBoxPosition.inlineBox->lineLayoutItem().node() << "@" << inlineBoxPosition.offsetInBox;
+    return ostream << inlineBoxPosition.inlineBox->getLineLayoutItem().node() << "@" << inlineBoxPosition.offsetInBox;
 }
 
 class VisibleUnitsTest : public EditingTestBase {
 };
 
 TEST_F(VisibleUnitsTest, absoluteCaretBoundsOf)
 {
     const char* bodyContent = "<p id='host'><b id='one'>11</b><b id='two'>22</b></p>";
     const char* shadowContent = "<div><content select=#two></content><content select=#one></content></div>";
     setBodyContent(bodyContent);
@@ skipping 1244 matching lines @@
     EXPECT_EQ(PositionInFlatTree(space, 1), startOfWord(createVisiblePositionInFlatTree(*three, 1)).deepEquivalent());
 
     EXPECT_EQ(Position(four, 0), startOfWord(createVisiblePositionInDOMTree(*four, 1)).deepEquivalent());
     EXPECT_EQ(PositionInFlatTree(four, 0), startOfWord(createVisiblePositionInFlatTree(*four, 1)).deepEquivalent());
 
     EXPECT_EQ(Position(space, 1), startOfWord(createVisiblePositionInDOMTree(*five, 1)).deepEquivalent());
     EXPECT_EQ(PositionInFlatTree(space, 1), startOfWord(createVisiblePositionInFlatTree(*five, 1)).deepEquivalent());
 }
 
 } // namespace blink