Making Unicode character names consistent

Source/core/layout/LayoutTreeAsText.cpp

 /*
  * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 120 matching lines @@
     StringBuilder result;
     result.append('"');
     for (unsigned i = 0; i != s.length(); ++i) {
         UChar c = s[i];
         if (c == '\\') {
             result.append('\\');
             result.append('\\');
         } else if (c == '"') {
             result.append('\\');
             result.append('"');
-        } else if (c == '\n' || c == noBreakSpace) {
+        } else if (c == '\n' || c == noBreakSpaceCharacter) {
             result.append(' ');
         } else {
             if (c >= 0x20 && c < 0x7F) {
                 result.append(c);
             } else {
                 result.append('\\');
                 result.append('x');
                 result.append('{');
                 appendUnsignedAsHex(c, result);
                 result.append('}');
@@ skipping 173 matching lines @@
         }
     }
 
     if (o.isListMarker()) {
         String text = toLayoutListMarker(o).text();
         if (!text.isEmpty()) {
             if (text.length() != 1) {
                 text = quoteAndEscapeNonPrintables(text);
             } else {
                 switch (text[0]) {
-                case bullet:
+                case bulletCharacter:
                     text = "bullet";
                     break;
-                case blackSquare:
+                case blackSquareCharacter:
                     text = "black square";
                     break;
-                case whiteBullet:
+                case whiteBulletCharacter:
                     text = "white bullet";
                     break;
                 default:
                     text = quoteAndEscapeNonPrintables(text);
                 }
             }
             ts << ": " << text;
         }
     }
 
@@ skipping 428 matching lines @@
     element->document().updateLayout();
 
     LayoutObject* layoutObject = element->layoutObject();
     if (!layoutObject || !layoutObject->isListItem())
         return String();
 
     return toLayoutListItem(layoutObject)->markerText();
 }
 
 } // namespace blink