Replace StyleRange with BreakList; update RenderText, etc.

ui/gfx/font.h

Index: ui/gfx/font.h
diff --git a/ui/gfx/font.h b/ui/gfx/font.h
index aa2b1c7c0a87f632250261ed22a17add6ede2b2c..c05e76c5c16e47068cd980e9c1402052f569df07 100644
--- a/ui/gfx/font.h
+++ b/ui/gfx/font.h
@@ -25,7 +25,7 @@ class UI_EXPORT Font {
     NORMAL = 0,
     BOLD = 1,
     ITALIC = 2,
-    UNDERLINED = 4,
+    UNDERLINE = 4,
   };
 
   // Creates a font with the default name and style.
@@ -56,7 +56,7 @@ class UI_EXPORT Font {
   // |size_delta| is the size in pixels to add to the current font. See the
   // single argument version of this method for an example.
   // The style parameter specifies the new style for the font, and is a
-  // bitmask of the values: BOLD, ITALIC and UNDERLINED.
+  // bitmask of the values: BOLD, ITALIC and UNDERLINE.
   Font DeriveFont(int size_delta, int style) const;
 
   // Returns the number of vertical pixels needed to display characters from