summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-26 20:46:13 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-26 20:46:13 +0000
commitabaee52d2e706b74e266e0c8ee7bebfba1221f30 (patch)
tree311b82b1255d3a337f3b543f19576910d8283334 /net
parent55d2595636656e36c37b30701f336b2f1c0f1826 (diff)
downloadchromium_src-abaee52d2e706b74e266e0c8ee7bebfba1221f30.zip
chromium_src-abaee52d2e706b74e266e0c8ee7bebfba1221f30.tar.gz
chromium_src-abaee52d2e706b74e266e0c8ee7bebfba1221f30.tar.bz2
Update eTLD data for changes to .cr. Parallels https://bugzilla.mozilla.org/show_bug.cgi?id=512774
BUG=19808 TEST=Type "sauny.cr" into Omnibox and check that default action is navigation, not search. Review URL: http://codereview.chromium.org/173513 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24523 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/base/effective_tld_names.cc8
-rw-r--r--net/base/effective_tld_names.dat11
2 files changed, 16 insertions, 3 deletions
diff --git a/net/base/effective_tld_names.cc b/net/base/effective_tld_names.cc
index d9455f3..eb6ff32 100644
--- a/net/base/effective_tld_names.cc
+++ b/net/base/effective_tld_names.cc
@@ -103,7 +103,6 @@ const char net::RegistryControlledDomainService::kDomainData[] =
"*.bt\n"
"*.chiba.jp\n"
"*.ck\n"
- "*.cr\n"
"*.cy\n"
"*.do\n"
"*.eg\n"
@@ -217,6 +216,7 @@ const char net::RegistryControlledDomainService::kDomainData[] =
"ac.be\n"
"ac.ci\n"
"ac.cn\n"
+ "ac.cr\n"
"ac.gn\n"
"ac.im\n"
"ac.in\n"
@@ -702,6 +702,7 @@ const char net::RegistryControlledDomainService::kDomainData[] =
"co.bi\n"
"co.bw\n"
"co.ci\n"
+ "co.cr\n"
"co.gg\n"
"co.gy\n"
"co.hu\n"
@@ -961,6 +962,7 @@ const char net::RegistryControlledDomainService::kDomainData[] =
"ecn.br\n"
"ed.ao\n"
"ed.ci\n"
+ "ed.cr\n"
"ed.jp\n"
"ed.pw\n"
"edu\n"
@@ -1142,6 +1144,7 @@ const char net::RegistryControlledDomainService::kDomainData[] =
"fhsk.se\n"
"fhv.se\n"
"fi\n"
+ "fi.cr\n"
"fi.it\n"
"fie.ee\n"
"field.museum\n"
@@ -1288,6 +1291,7 @@ const char net::RegistryControlledDomainService::kDomainData[] =
"gn\n"
"gniezno.pl\n"
"go.ci\n"
+ "go.cr\n"
"go.it\n"
"go.jp\n"
"go.kr\n"
@@ -2421,6 +2425,7 @@ const char net::RegistryControlledDomainService::kDomainData[] =
"or.at\n"
"or.bi\n"
"or.ci\n"
+ "or.cr\n"
"or.it\n"
"or.jp\n"
"or.kr\n"
@@ -2832,6 +2837,7 @@ const char net::RegistryControlledDomainService::kDomainData[] =
"s.se\n"
"sa\n"
"sa.com\n"
+ "sa.cr\n"
"sa.edu.au\n"
"sa.gov.au\n"
"sa.it\n"
diff --git a/net/base/effective_tld_names.dat b/net/base/effective_tld_names.dat
index 9576e40..4728a82 100644
--- a/net/base/effective_tld_names.dat
+++ b/net/base/effective_tld_names.dat
@@ -39,7 +39,7 @@
//
// ***** END LICENSE BLOCK *****
-// Chromium note: this based on Mozilla's revision 1.9 of this file:
+// Chromium note: this based on Mozilla's file:
// http://mxr.mozilla.org/mozilla/source/netwerk/dns/src/effective_tld_names.dat?raw=1
// ac : http://en.wikipedia.org/wiki/.ac
@@ -685,7 +685,14 @@ za.com
coop
// cr : http://en.wikipedia.org/wiki/.cr
-*.cr
+cr
+ac.cr
+co.cr
+ed.cr
+fi.cr
+go.cr
+or.cr
+sa.cr
// cu : http://en.wikipedia.org/wiki/.cu
cu