diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-24 18:21:28 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-24 18:21:28 +0000 |
| commit | 16357f40aedc76ed8ca2c2abd13b3286b46a5db2 (patch) | |
| tree | b7ab1f39ad57dcb7f4a766c65baed361796752a3 /net | |
| parent | 0c417794b6f80ae25fa525d0f5b0b2a6a6b6156f (diff) | |
| download | chromium_src-16357f40aedc76ed8ca2c2abd13b3286b46a5db2.zip chromium_src-16357f40aedc76ed8ca2c2abd13b3286b46a5db2.tar.gz chromium_src-16357f40aedc76ed8ca2c2abd13b3286b46a5db2.tar.bz2 | |
Merge 256341 "Fix net_unittests failure caused by assuming "foo"..."
> Fix net_unittests failure caused by assuming "foo" would never be a valid TLD
>
> Charleston Road Registry applied for, and was granted, "foo" as a TLD on
> 2014-01-30
>
> BUG=37436
> R=dmichael@chromium.org
> TBR=pkasting
>
> Review URL: https://codereview.chromium.org/194703014
TBR=rsleevi@chromium.org
Review URL: https://codereview.chromium.org/210083005
git-svn-id: svn://svn.chromium.org/chrome/branches/1847/src@258977 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/base/registry_controlled_domains/registry_controlled_domain_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/base/registry_controlled_domains/registry_controlled_domain_unittest.cc b/net/base/registry_controlled_domains/registry_controlled_domain_unittest.cc index d1d96f9..12eeba3 100644 --- a/net/base/registry_controlled_domains/registry_controlled_domain_unittest.cc +++ b/net/base/registry_controlled_domains/registry_controlled_domain_unittest.cc @@ -288,9 +288,9 @@ TEST_F(RegistryControlledDomainTest, TestDefaultData) { EXCLUDE_UNKNOWN_REGISTRIES)); EXPECT_EQ(3U, GetRegistryLengthFromURL("http://ferretcentral.org", EXCLUDE_UNKNOWN_REGISTRIES)); - EXPECT_EQ(0U, GetRegistryLengthFromURL("http://nowhere.foo", + EXPECT_EQ(0U, GetRegistryLengthFromURL("http://nowhere.notavaliddomain", EXCLUDE_UNKNOWN_REGISTRIES)); - EXPECT_EQ(3U, GetRegistryLengthFromURL("http://nowhere.foo", + EXPECT_EQ(15U, GetRegistryLengthFromURL("http://nowhere.notavaliddomain", INCLUDE_UNKNOWN_REGISTRIES)); } |