Supports gfx::FontList in gfx::Canvas and ui::ElideText family.

ui/gfx/canvas_android.cc

Index: ui/gfx/canvas_android.cc
diff --git a/ui/gfx/canvas_android.cc b/ui/gfx/canvas_android.cc
index c26a668f1d466ba805125e9dd06f77faa9f70f16..54e45f7653a69acc640507c22039aa540d03e43a 100644
--- a/ui/gfx/canvas_android.cc
+++ b/ui/gfx/canvas_android.cc
@@ -5,13 +5,12 @@
 #include "ui/gfx/canvas.h"
 
 #include "base/logging.h"
-#include "ui/gfx/font.h"
 
 namespace gfx {
 
 // static
 void Canvas::SizeStringInt(const base::string16& text,
-                           const gfx::Font& font,
+                           const FontList& font_list,
                            int* width,
                            int* height,
                            int line_height,
@@ -19,13 +18,22 @@ void Canvas::SizeStringInt(const base::string16& text,
   NOTIMPLEMENTED();
 }
 
-void Canvas::DrawStringWithShadows(const base::string16& text,
-                                   const gfx::Font& font,
-                                   SkColor color,
-                                   const gfx::Rect& text_bounds,
-                                   int line_height,
-                                   int flags,
-                                   const ShadowValues& shadows) {
+void Canvas::DrawStringRectWithHalo(const base::string16& text,
+                                    const FontList& font_list,
+                                    SkColor text_color,
+                                    SkColor halo_color_in,
+                                    const Rect& display_rect,
+                                    int flags) {
+  NOTIMPLEMENTED();
+}
+
+void Canvas::DrawStringRectWithShadows(const base::string16& text,
+                                       const FontList& font_list,
+                                       SkColor color,
+                                       const Rect& text_bounds,
+                                       int line_height,
+                                       int flags,
+                                       const ShadowValues& shadows) {
   NOTIMPLEMENTED();
 }