Remove Linux-specific canvas_skia.cc hack.

ui/gfx/canvas_skia.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/gfx/canvas.h"
 
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/gfx/font_list.h"
@@ skipping 134 matching lines @@
   if (flags & Canvas::NO_SUBPIXEL_RENDERING)
     render_text->set_background_is_transparent(true);
 
   render_text->SetColor(color);
   const int font_style = font_list.GetFontStyle();
   render_text->SetStyle(BOLD, (font_style & Font::BOLD) != 0);
   render_text->SetStyle(ITALIC, (font_style & Font::ITALIC) != 0);
   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
 void Canvas::SizeStringInt(const base::string16& text,
                            const FontList& font_list,
                            int* width, int* height,
                            int line_height,
                            int flags) {
   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);
 #endif
 
   if ((flags & MULTI_LINE) && *width != 0) {
     gfx::WordWrapBehavior wrap_behavior = gfx::TRUNCATE_LONG_WORDS;
     if (flags & CHARACTER_BREAK)
       wrap_behavior = gfx::WRAP_LONG_WORDS;
     else if (!(flags & NO_ELLIPSIS))
@@ skipping 42 matching lines @@
 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) {
   if (!IntersectsClipRect(text_bounds))
     return;
 
-  flags = AdjustPlatformSpecificFlags(text, flags);
-
   Rect clip_rect(text_bounds);
   clip_rect.Inset(ShadowValue::GetMargin(shadows));
 
   canvas_->save(SkCanvas::kClip_SaveFlag);
   ClipRect(clip_rect);
 
   Rect rect(text_bounds);
   base::string16 adjusted_text = text;
 
 #if defined(OS_WIN)
@@ skipping 209 matching lines @@
     size_t desired_characters_to_truncate_from_head,
     const Font& font,
     SkColor color,
     const Rect& display_rect) {
   DrawFadeTruncatingStringRect(text, truncate_mode,
                                desired_characters_to_truncate_from_head,
                                FontList(font), color, display_rect);
 }
 
 }  // namespace gfx