diff options
author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-09 03:32:36 +0000 |
---|---|---|
committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-09 03:32:36 +0000 |
commit | 031ffedfe4071b177730c84361b930aed072c09c (patch) | |
tree | 3065c8052ea5023a91e29a272f0c3afd1c205911 /ui/gfx/font_unittest.cc | |
parent | 238083df6afe5e7426ab7ff2553d53f9a4dae562 (diff) | |
download | chromium_src-031ffedfe4071b177730c84361b930aed072c09c.zip chromium_src-031ffedfe4071b177730c84361b930aed072c09c.tar.gz chromium_src-031ffedfe4071b177730c84361b930aed072c09c.tar.bz2 |
ui/gfx: Use base::string16 now that string16 was moved into base namespace.
base/string16.h was moved into base namespace in r191198 by Brett.
BUG=None
TBR=ben@chromium.org
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/16051006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205096 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/font_unittest.cc')
-rw-r--r-- | ui/gfx/font_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/gfx/font_unittest.cc b/ui/gfx/font_unittest.cc index 69d1b6e..8ab3d2b 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")), |