Remove Linux-specific mapping from NO_ELLIPSIS to MULTI_LINE in canvas_skia.cc.

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/base/range/range.h"
@@ skipping 161 matching lines @@
   if (range.IsValid() && !style.underline) {
     style.range = range;
     style.underline = true;
     render_text->ApplyStyleRange(style);
   }
 }
 
 // Returns updated |flags| to match platform-specific expected behavior.
 int AdjustPlatformSpecificFlags(const string16& text, int flags) {
 #if defined(OS_LINUX)
-  // TODO(asvitkine): On Linux, NO_ELLIPSIS really means MULTI_LINE.
-  //                  http://crbug.com/107357
-  if (flags & gfx::Canvas::NO_ELLIPSIS)
-    flags |= gfx::Canvas::MULTI_LINE;
-
   // TODO(asvitkine): ash/tooltips/tooltip_controller.cc adds \n's to the string
   //                  without passing MULTI_LINE.
   if (text.find('\n') != string16::npos)
     flags |= gfx::Canvas::MULTI_LINE;
 #endif
 
   return flags;
 }
 
 }  // anonymous namespace
@@ skipping 278 matching lines @@
   rect.set_height(line_height);
   render_text->SetDisplayRect(rect);
 
   canvas_->save(SkCanvas::kClip_SaveFlag);
   ClipRect(display_rect);
   render_text->Draw(this);
   canvas_->restore();
 }
 
 }  // namespace gfx