diff options
| author | mmoss@chromium.org <mmoss@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-27 17:56:21 +0000 |
|---|---|---|
| committer | mmoss@chromium.org <mmoss@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-27 17:56:21 +0000 |
| commit | c3287b7a53a785756206c447bd7d356db6796220 (patch) | |
| tree | 8aa43774594191c6a8285dcd32991ad3dd983fc3 /net | |
| parent | 1bba17e11ffd134c660246560952d63f7c7e415b (diff) | |
| download | chromium_src-c3287b7a53a785756206c447bd7d356db6796220.zip chromium_src-c3287b7a53a785756206c447bd7d356db6796220.tar.gz chromium_src-c3287b7a53a785756206c447bd7d356db6796220.tar.bz2 | |
Bring in googleurl changes which fix URL parsing layout test.
Also update net_unittest to match new 'file:' parsing logic.
Review URL: http://codereview.chromium.org/18789
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8725 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/base/net_util_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/base/net_util_unittest.cc b/net/base/net_util_unittest.cc index d1def1c..68ec2b3 100644 --- a/net/base/net_util_unittest.cc +++ b/net/base/net_util_unittest.cc @@ -107,7 +107,7 @@ TEST(NetUtilTest, FileURLConversion) { {L"/foo/bar.txt", L"file:/foo/bar.txt"}, {L"/c:/foo/bar.txt", L"file:\\\\\\c:/foo/bar.txt"}, {L"/foo/bar.txt", L"file:foo/bar.txt"}, - {L"/foo/bar.txt", L"file://foo/bar.txt"}, + {L"/bar.txt", L"file://foo/bar.txt"}, {L"/foo/bar.txt", L"file:///foo/bar.txt"}, {L"/foo/bar.txt", L"file:////foo/bar.txt"}, {L"/foo/bar.txt", L"file:////foo//bar.txt"}, |