Remove Linux-specific canvas_skia.cc hack.

ui/gfx/canvas_skia.cc

Index: ui/gfx/canvas_skia.cc
===================================================================
--- ui/gfx/canvas_skia.cc	(revision 225246)
+++ ui/gfx/canvas_skia.cc	(working copy)
@@ -152,18 +152,6 @@
   render_text->SetStyle(UNDERLINE, (font_style & Font::UNDERLINE) != 0);
 }
 
-// Returns updated |flags| to match platform-specific expected behavior.
-int AdjustPlatformSpecificFlags(const base::string16& text, int flags) {
-#if defined(OS_LINUX)
-  // TODO(asvitkine): ash/tooltips/tooltip_controller.cc adds \n's to the string
-  //                  without passing MULTI_LINE.
-  if (text.find('\n') != base::string16::npos)
-    flags |= Canvas::MULTI_LINE;
-#endif
-
-  return flags;
-}
-
 }  // namespace
 
 // static
@@ -175,8 +163,6 @@
   DCHECK_GE(*width, 0);
   DCHECK_GE(*height, 0);
 
-  flags = AdjustPlatformSpecificFlags(text, flags);
-
   base::string16 adjusted_text = text;
 #if defined(OS_WIN)
   AdjustStringDirection(flags, &adjusted_text);
@@ -239,8 +225,6 @@
   if (!IntersectsClipRect(text_bounds))
     return;
 
-  flags = AdjustPlatformSpecificFlags(text, flags);
-
   Rect clip_rect(text_bounds);
   clip_rect.Inset(ShadowValue::GetMargin(shadows));