Use GetDisplayText() instead of text() for rendering text.

ui/gfx/render_text_unittest.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/render_text.h"
 
 #include <algorithm>
 
 #include "base/format_macros.h"
 #include "base/i18n/break_iterator.h"
@@ skipping 10 matching lines @@
 #include "ui/gfx/font.h"
 #include "ui/gfx/range/range.h"
 #include "ui/gfx/range/range_f.h"
 #include "ui/gfx/render_text_harfbuzz.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #include "ui/gfx/platform_font_win.h"
 #endif
 
+#if defined(OS_MACOSX)
+#include <ApplicationServices/ApplicationServices.h>
+
+#include "ui/gfx/render_text_mac.h"
+#endif
+
 using base::ASCIIToUTF16;
 using base::UTF8ToUTF16;
 using base::WideToUTF16;
 using base::WideToUTF8;
 
 namespace gfx {
 
 namespace {
 
 // Various weak, LTR, RTL, and Bidi string cases with three characters each.
@@ skipping 2578 matching lines @@
       SkColor color = buffer[width + y * kCanvasSize.width()];
       EXPECT_LT(220U, color_utils::GetLuminanceForColor(color)) << string;
       for (int x = 1; x < kTestWidth; ++x) {
         color = buffer[width + x + y * kCanvasSize.width()];
         EXPECT_EQ(SK_ColorWHITE, color) << string;
       }
     }
   }
 }
 
+#if defined(OS_MACOSX)
+TEST_F(RenderTextTest, Mac_ElidedText) {
+  RenderTextMac render_text;
+  base::string16 text(ASCIIToUTF16("This is an example."));
+  render_text.SetText(text);
+  gfx::Size string_size = render_text.GetStringSize();
+  render_text.SetDisplayRect(gfx::Rect(string_size));
+  render_text.EnsureLayout();
+  // NOTE: Character and glyph counts are only comparable for simple text.
+  EXPECT_EQ(text.size(),
+            static_cast<size_t>(CTLineGetGlyphCount(render_text.line_)));
+
+  render_text.SetElideBehavior(ELIDE_TAIL);
+  string_size.set_width(string_size.width() / 2);
+  render_text.SetDisplayRect(gfx::Rect(string_size));
+  render_text.EnsureLayout();
+  CFIndex glyph_count = CTLineGetGlyphCount(render_text.line_);
+  EXPECT_GT(text.size(), static_cast<size_t>(glyph_count));
+  EXPECT_NE(0, glyph_count);
+}
+#endif
+
 }  // namespace gfx