diff options
Diffstat (limited to 'ui/base')
| -rw-r--r-- | ui/base/text/text_elider.h | 2 | ||||
| -rw-r--r-- | ui/base/text/text_elider_unittest.cc | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ui/base/text/text_elider.h b/ui/base/text/text_elider.h index b2ec600..caac9d8 100644 --- a/ui/base/text/text_elider.h +++ b/ui/base/text/text_elider.h @@ -29,7 +29,7 @@ UI_EXPORT extern const char kEllipsis[]; // which composed of parts from subdomain, domain, path, filename and query. // A "..." is added automatically at the end if the elided string is bigger // than the available pixel width. For available pixel width = 0, empty -// string is returned. |languages| is a comma separted list of ISO 639 +// string is returned. |languages| is a comma separated list of ISO 639 // language codes and is used to determine what characters are understood // by a user. It should come from |prefs::kAcceptLanguages|. // diff --git a/ui/base/text/text_elider_unittest.cc b/ui/base/text/text_elider_unittest.cc index b342b4c..217170c 100644 --- a/ui/base/text/text_elider_unittest.cc +++ b/ui/base/text/text_elider_unittest.cc @@ -40,7 +40,7 @@ struct TestData { const int compare_result; }; -void RunTest(Testcase* testcases, size_t num_testcases) { +void RunUrlTest(Testcase* testcases, size_t num_testcases) { static const gfx::Font font; for (size_t i = 0; i < num_testcases; ++i) { const GURL url(testcases[i].input); @@ -78,7 +78,7 @@ TEST(TextEliderTest, TestGeneralEliding) { "www.google.com/intl/en/ads/?aLongQ" + kEllipsisStr}, }; - RunTest(testcases, arraysize(testcases)); + RunUrlTest(testcases, arraysize(testcases)); } // When there is very little space available, the elision code will shorten @@ -101,7 +101,7 @@ TEST(TextEliderTest, TestTrailingEllipsisSlashEllipsisHack) { {"http://battersbox.com/directory/foo/peter_paul_and_mary.html", "battersbox.com/" + kEllipsisStr + "/peter" + kEllipsisStr}, }; - RunTest(testcases, arraysize(testcases)); + RunUrlTest(testcases, arraysize(testcases)); } // Test eliding of empty strings, URLs with ports, passwords, queries, etc. @@ -139,7 +139,7 @@ TEST(TextEliderTest, TestMoreEliding) { "www/%E4%A0%E5%A5%BD?q=\xe4\xbd\xa0\xe5\xa5\xbd#\xe4\xbd\xa0"}, }; - RunTest(testcases, arraysize(testcases)); + RunUrlTest(testcases, arraysize(testcases)); } // Test eliding of file: URLs. @@ -164,7 +164,7 @@ TEST(TextEliderTest, TestFileURLEliding) { {"file://filer/foo/bar/file", "filer/" + kEllipsisStr + "/file"}, }; - RunTest(testcases, arraysize(testcases)); + RunUrlTest(testcases, arraysize(testcases)); } TEST(TextEliderTest, TestFilenameEliding) { |