ABANDONED CL: Changes needed to make things compile after running rewrite_to_chrome_style tool.

third_party/WebKit/Source/core/dom/NodeTraversal.h

Index: third_party/WebKit/Source/core/dom/NodeTraversal.h
diff --git a/third_party/WebKit/Source/core/dom/NodeTraversal.h b/third_party/WebKit/Source/core/dom/NodeTraversal.h
index b535d914d424408cc5a30f02ff4cef9a69e69906..f4bfceeb083ec0dce360afb5f0e8713a99f68d06 100644
--- a/third_party/WebKit/Source/core/dom/NodeTraversal.h
+++ b/third_party/WebKit/Source/core/dom/NodeTraversal.h
@@ -346,24 +346,28 @@ NodeTraversal::startsAfter(const Node& start) {
 };
 
 template <class NodeType>
-inline Node* NodeTraversal::traverseNextTemplate(NodeType& current) {
+inline Node* NodeTraversal::TraverseNextTemplate(NodeType& current) {
+  /* DO NOT SUBMIT - conflict resolution marker */
+  /* Below we should have: hasChildren, firstChild, nextSibling, etc. */
   if (current.hasChildren())
     return current.firstChild();
   if (current.nextSibling())
     return current.nextSibling();
-  return nextAncestorSibling(current);
+  return NextAncestorSibling(current);
 }
 
 template <class NodeType>
-inline Node* NodeTraversal::traverseNextTemplate(NodeType& current,
-                                                 const Node* stayWithin) {
+inline Node* NodeTraversal::TraverseNextTemplate(NodeType& current,
+                                                 const Node* stay_within) {
+  /* DO NOT SUBMIT - conflict resolution marker */
+  /* Below we should have: hasChildren, firstChild, nextSibling, etc. */
   if (current.hasChildren())
     return current.firstChild();
-  if (current == stayWithin)
+  if (current == stay_within)
     return 0;
   if (current.nextSibling())
     return current.nextSibling();
-  return nextAncestorSibling(current, stayWithin);
+  return NextAncestorSibling(current, stay_within);
 }
 
 inline Node* NodeTraversal::nextSkippingChildren(const Node& current) {
@@ -389,7 +393,9 @@ inline Node& NodeTraversal::highestAncestorOrSelf(Node& current) {
 }
 
 template <class NodeType>
-inline Node* NodeTraversal::childAtTemplate(NodeType& parent, unsigned index) {
+inline Node* NodeTraversal::ChildAtTemplate(NodeType& parent, unsigned index) {
+  /* DO NOT SUBMIT - conflict resolution marker */
+  /* Below we should have: hasChildren, firstChild, nextSibling, etc. */
   Node* child = parent.firstChild();
   while (child && index--)
     child = child->nextSibling();