summaryrefslogtreecommitdiffstats
path: root/chrome/browser/net
diff options
context:
space:
mode:
authorhbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-26 10:21:49 +0000
committerhbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-26 10:21:49 +0000
commitb5df94ed369ac59a76e81fb8a13552cac449509f (patch)
tree90aa349879e8fe6ad8ee550aaea8556b8d3410b4 /chrome/browser/net
parent3ced98f4dad7b83de0d7b5f3fd9452c556799822 (diff)
downloadchromium_src-b5df94ed369ac59a76e81fb8a13552cac449509f.zip
chromium_src-b5df94ed369ac59a76e81fb8a13552cac449509f.tar.gz
chromium_src-b5df94ed369ac59a76e81fb8a13552cac449509f.tar.bz2
Reverting 10456.
Review URL: http://codereview.chromium.org/28180 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10458 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net')
-rw-r--r--chrome/browser/net/url_fixer_upper.cc2
-rw-r--r--chrome/browser/net/url_fixer_upper_unittest.cc20
2 files changed, 1 insertions, 21 deletions
diff --git a/chrome/browser/net/url_fixer_upper.cc b/chrome/browser/net/url_fixer_upper.cc
index 08d60d2..121807b 100644
--- a/chrome/browser/net/url_fixer_upper.cc
+++ b/chrome/browser/net/url_fixer_upper.cc
@@ -360,7 +360,7 @@ string URLFixerUpper::SegmentURL(const string& text,
string URLFixerUpper::FixupURL(const string& text,
const string& desired_tld) {
string trimmed;
- TrimWhitespaceUTF8(text, TRIM_ALL, &trimmed);
+ TrimWhitespace(text, TRIM_ALL, &trimmed);
if (trimmed.empty())
return string(); // Nothing here.
diff --git a/chrome/browser/net/url_fixer_upper_unittest.cc b/chrome/browser/net/url_fixer_upper_unittest.cc
index ef26b5e..1e6dbc7 100644
--- a/chrome/browser/net/url_fixer_upper_unittest.cc
+++ b/chrome/browser/net/url_fixer_upper_unittest.cc
@@ -177,26 +177,6 @@ struct fixup_case {
{"ftpblah.google.com", "", "http://ftpblah.google.com/"},
{"ftp", "", "http://ftp/"},
{"google.ftp.com", "", "http://google.ftp.com/"},
- // URLs which end with an ISO-8859 next-line (0x85).
- { "http://google.com/search?q=\xd0\x85", "",
- "http://google.com/search?q=\xd0\x85"
- },
- { "http://google.com/search?q=\xec\x97\x85", "",
- "http://google.com/search?q=\xec\x97\x85"
- },
- { "http://google.com/search?q=\xf0\x90\x80\x85", "",
- "http://google.com/search?q=\xf0\x90\x80\x85"
- },
- // URLs which end with a non-break space (0xA0).
- { "http://google.com/search?q=\xd0\xa0", "",
- "http://google.com/search?q=\xd0\xa0"
- },
- { "http://google.com/search?q=\xec\x97\xa0", "",
- "http://google.com/search?q=\xec\x97\xa0"
- },
- { "http://google.com/search?q=\xf0\x90\x80\xa0", "",
- "http://google.com/search?q=\xf0\x90\x80\xa0"
- },
};
TEST(URLFixerUpperTest, FixupURL) {