diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-06 05:06:20 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-06 05:06:20 +0000 |
| commit | 7fc13edf63fcb30391edec083ea496809607917a (patch) | |
| tree | 16d7123511520ba9b7f1ca1d36093bdc71dc97d1 /net | |
| parent | 309d27740389acc1cfdda031b8fb43781e6022a3 (diff) | |
| download | chromium_src-7fc13edf63fcb30391edec083ea496809607917a.zip chromium_src-7fc13edf63fcb30391edec083ea496809607917a.tar.gz chromium_src-7fc13edf63fcb30391edec083ea496809607917a.tar.bz2 | |
Pulls the latest googleurl to get the fix for
BUG=http://crbug.com/160
and integrates the update to IsStandard in that version. Adds several internal
schemes as "standard" and initializes them at startup. Fixes a few hardcoded
URL schemes I noticed.
Make typing "//foo" into the URL bar treat slashes in "strict" mode on Windows,
which means we'll only accept UNC if you use backslashes. This matches IE's
behavior.
BUG=http://crbug.com/33038
TEST=covered by unit tests
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40818 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/base/net_util_unittest.cc | 4 | ||||
| -rw-r--r-- | net/url_request/request_tracker_unittest.cc | 18 |
2 files changed, 12 insertions, 10 deletions
diff --git a/net/base/net_util_unittest.cc b/net/base/net_util_unittest.cc index 9265f0a4..f24b10a 100644 --- a/net/base/net_util_unittest.cc +++ b/net/base/net_util_unittest.cc @@ -1592,9 +1592,9 @@ TEST(NetUtilTest, SimplifyUrlForRequest) { "ftp://user:pass@google.com:80/sup?yo#X#X", "ftp://google.com:80/sup?yo", }, - { // Try an standard URL with unknow scheme. + { // Try an nonstandard URL + "foobar://user:pass@google.com:80/sup?yo#X#X", "foobar://user:pass@google.com:80/sup?yo#X#X", - "foobar://google.com:80/sup?yo", }, }; for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) { diff --git a/net/url_request/request_tracker_unittest.cc b/net/url_request/request_tracker_unittest.cc index d31587c..633c923 100644 --- a/net/url_request/request_tracker_unittest.cc +++ b/net/url_request/request_tracker_unittest.cc @@ -199,30 +199,32 @@ TEST(RequestTrackerTest, GraveyardCanBeFiltered) { tracker.SetGraveyardFilter(ShouldRequestBeAddedToGraveyard); // This will be excluded. - TestRequest req1(GURL("chrome://dontcare")); + GURL url1("chrome://dontcare/"); + TestRequest req1(url1); tracker.Add(&req1); tracker.Remove(&req1); // This will be be added to graveyard. - TestRequest req2(GURL("chrome2://dontcare")); + GURL url2("chrome2://dontcare/"); + TestRequest req2(url2); tracker.Add(&req2); tracker.Remove(&req2); // This will be be added to graveyard. - TestRequest req3(GURL("http://foo")); + GURL url3("http://foo/"); + TestRequest req3(url3); tracker.Add(&req3); tracker.Remove(&req3); // This will be be excluded. - TestRequest req4(GURL("data:sup")); + GURL url4("data:sup"); + TestRequest req4(url4); tracker.Add(&req4); tracker.Remove(&req4); ASSERT_EQ(2u, tracker.GetRecentlyDeceased().size()); - EXPECT_EQ("chrome2://dontcare/", - tracker.GetRecentlyDeceased()[0].original_url.spec()); - EXPECT_EQ("http://foo/", - tracker.GetRecentlyDeceased()[1].original_url.spec()); + EXPECT_EQ(url2, tracker.GetRecentlyDeceased()[0].original_url); + EXPECT_EQ(url3, tracker.GetRecentlyDeceased()[1].original_url); } // Convert an unbounded tracker back to being bounded. |