Add fade eliding for Views Labels; related cleanup.

ui/views/corewm/tooltip_aura_unittest.cc

 // Copyright 2013 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/views/corewm/tooltip_aura.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/font_list.h"
@@ skipping 68 matching lines @@
 #if !defined(OS_WIN)
   // Tooltip with really long word gets elided.
   tooltip.clear();
   width = line_count = -1;
   tooltip = UTF8ToUTF16(std::string('a', max_pixel_width));
   TooltipAura::TrimTooltipToFit(font_list, max_width, &tooltip, &width,
                                 &line_count);
   EXPECT_NEAR(max_pixel_width, width, 5);
   EXPECT_EQ(1, line_count);
   EXPECT_EQ(gfx::ElideText(UTF8ToUTF16(std::string('a', max_pixel_width)),
-                           font_list,
-                           max_pixel_width, gfx::ELIDE_AT_END), tooltip);
+                           font_list, max_pixel_width, gfx::ELIDE_TAIL),
+            tooltip);
 #endif
 
   // Normal small tooltip should stay as is.
   tooltip.clear();
   width = line_count = -1;
   tooltip = ASCIIToUTF16("Small Tooltip");
   TooltipAura::TrimTooltipToFit(font_list, max_width, &tooltip, &width,
                                 &line_count);
   EXPECT_EQ(gfx::GetStringWidth(ASCIIToUTF16("Small Tooltip"), font_list),
             width);
@@ skipping 22 matching lines @@
   TooltipAura::TrimTooltipToFit(font_list, max_width, &tooltip, &width,
                                 &line_count);
   EXPECT_EQ(gfx::GetStringWidth(ASCIIToUTF16("Small  Tool  t\tip"), font_list),
             width);
   EXPECT_EQ(1, line_count);
   EXPECT_EQ(ASCIIToUTF16("Small  Tool  t\tip"), tooltip);
 }
 
 }  // namespace corewm
 }  // namespace views