Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(111)

Unified Diff: ui/gfx/font_unittest.cc

Issue 16051006: ui/gfx: Use base::string16 now that string16 was moved into base namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gfx/font_fallback_win.cc ('k') | ui/gfx/pango_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/font_unittest.cc
diff --git a/ui/gfx/font_unittest.cc b/ui/gfx/font_unittest.cc
index 69d1b6e8fef13577e9fd79fc6c25f0f425b02404..8ab3d2bbabdeeceac73d5aca8df6b972af8364eb 100644
--- a/ui/gfx/font_unittest.cc
+++ b/ui/gfx/font_unittest.cc
@@ -103,9 +103,9 @@ TEST_F(FontTest, AvgCharWidth) {
TEST_F(FontTest, Widths) {
Font cf("Arial", 16);
- ASSERT_EQ(cf.GetStringWidth(string16()), 0);
+ ASSERT_EQ(cf.GetStringWidth(base::string16()), 0);
ASSERT_GT(cf.GetStringWidth(ASCIIToUTF16("a")),
- cf.GetStringWidth(string16()));
+ cf.GetStringWidth(base::string16()));
ASSERT_GT(cf.GetStringWidth(ASCIIToUTF16("ab")),
cf.GetStringWidth(ASCIIToUTF16("a")));
ASSERT_GT(cf.GetStringWidth(ASCIIToUTF16("abc")),
« no previous file with comments | « ui/gfx/font_fallback_win.cc ('k') | ui/gfx/pango_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698