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..cead54b5eddb811628276f8f2a69a6a0db744bb7 100644
--- a/ui/gfx/canvas_android.cc
+++ b/ui/gfx/canvas_android.cc
@@ -5,12 +5,21 @@
 #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::FontList& font_list,
+                           int* width,
+                           int* height,
+                           int line_height,
+                           int flags) {
+  NOTIMPLEMENTED();
+}
+
+// static
+void Canvas::SizeStringInt(const base::string16& text,
                            const gfx::Font& font,
                            int* width,
                            int* height,
@@ -20,6 +29,16 @@ void Canvas::SizeStringInt(const base::string16& text,
 }
 
 void Canvas::DrawStringWithShadows(const base::string16& text,
+                                   const gfx::FontList& font_list,
+                                   SkColor color,
+                                   const gfx::Rect& text_bounds,
+                                   int line_height,
+                                   int flags,
+                                   const ShadowValues& shadows) {
+  NOTIMPLEMENTED();
+}
+
+void Canvas::DrawStringWithShadows(const base::string16& text,
                                    const gfx::Font& font,
                                    SkColor color,
                                    const gfx::Rect& text_bounds,