Refresh Public Suffix List to the latest version.

This updates from revision
d8985509a9df2c25f5118f9d1e41a24f9739bd1f (2019-12-09)

to revision
7922d7c20e246552be418e8f72e577899fd30d99 (2020-02-18)

Bug: 1054078
Change-Id: I9a4da744ef4bd66ee13b15c64844686cc2228b4d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2064776Reviewed-by: Ryan Sleevi <rsleevi@chromium.org>
Commit-Queue: Erik Anderson <Erik.Anderson@microsoft.com>
Cr-Commit-Position: refs/heads/master@{#742994}

net/base/registry_controlled_domains/effective_tld_names.dat

@@ -245,7 +245,7 @@ wa.au
 // 3LDs
 act.edu.au
 catholic.edu.au
-eq.edu.au
+// eq.edu.au - Removed at the request of the Queensland Department of Education
 nsw.edu.au
 nt.edu.au
 qld.edu.au
@@ -986,8 +986,19 @@ fi
 // TODO: Check for updates (expected to be phased out around Q1/2009)
 aland.fi
 
-// fj : https://en.wikipedia.org/wiki/.fj
-*.fj
+// fj : http://domains.fj/
+// Submitted by registry <garth.miller@cocca.org.nz> 2020-02-11
+fj
+ac.fj
+biz.fj
+com.fj
+gov.fj
+info.fj
+mil.fj
+name.fj
+net.fj
+org.fj
+pro.fj
 
 // fk : https://en.wikipedia.org/wiki/.fk
 *.fk
@@ -6799,8 +6810,13 @@ yt
 مصر
 
 // xn--e1a4c ("eu", Cyrillic) : EU
+// https://eurid.eu
 ею
 
+// xn--qxa6a ("eu", Greek) : EU
+// https://eurid.eu
+ευ
+
 // xn--mgbah1a3hjkrd ("Mauritania", Arabic) : MR
 موريتانيا
 
@@ -7078,7 +7094,7 @@ org.zw
 
 // newGTLDs
 
-// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2019-12-02T17:16:24Z
+// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2020-02-06T17:49:42Z
 // This list is auto-generated, don't edit it manually.
 // aaa : 2015-02-26 American Automobile Association, Inc.
 aaa
@@ -7200,6 +7216,9 @@ alsace
 // alstom : 2015-07-30 ALSTOM
 alstom
 
+// amazon : 2019-12-19 Amazon EU S.à r.l.
+amazon
+
 // americanexpress : 2015-07-31 American Express Travel Related Services Company, Inc.
 americanexpress
 
@@ -7293,13 +7312,13 @@ auspost
 // author : 2014-12-18 Amazon Registry Services, Inc.
 author
 
-// auto : 2014-11-13 Cars Registry Limited
+// auto : 2014-11-13 Cars Registry Limited
 auto
 
 // autos : 2014-01-09 DERAutos, LLC
 autos
 
-// avianca : 2015-01-08 Aerovias del Continente Americano S.A. Avianca
+// avianca : 2015-01-08 Avianca Holdings S.A.
 avianca
 
 // aws : 2015-06-25 Amazon Registry Services, Inc.
@@ -7377,7 +7396,7 @@ bcn
 // beats : 2015-05-14 Beats Electronics, LLC
 beats
 
-// beauty : 2015-12-03 L'Oréal
+// beauty : 2015-12-03 XYZ.COM LLC
 beauty
 
 // beer : 2014-01-09 Minds + Machines Group Limited
@@ -7569,7 +7588,7 @@ capital
 // capitalone : 2015-08-06 Capital One Financial Corporation
 capitalone
 
-// car : 2015-01-22 Cars Registry Limited
+// car : 2015-01-22 Cars Registry Limited
 car
 
 // caravan : 2013-12-12 Caravan International, Inc.
@@ -7587,7 +7606,7 @@ career
 // careers : 2013-10-02 Binky Moon, LLC
 careers
 
-// cars : 2014-11-13 Cars Registry Limited
+// cars : 2014-11-13 Cars Registry Limited
 cars
 
 // casa : 2013-11-21 Minds + Machines Group Limited
@@ -7833,7 +7852,7 @@ cuisinella
 // cymru : 2014-05-08 Nominet UK
 cymru
 
-// cyou : 2015-01-22 Beijing Gamease Age Digital Technology Co., Ltd.
+// cyou : 2015-01-22 ShortDot SA
 cyou
 
 // dabur : 2014-02-06 Dabur India Limited
@@ -8400,7 +8419,7 @@ guitars
 // guru : 2013-08-27 Binky Moon, LLC
 guru
 
-// hair : 2015-12-03 L'Oréal
+// hair : 2015-12-03 XYZ.COM LLC
 hair
 
 // hamburg : 2014-02-20 Hamburg Top-Level-Domain GmbH
@@ -8799,9 +8818,6 @@ lexus
 // lgbt : 2014-05-08 Afilias Limited
 lgbt
 
-// liaison : 2014-10-02 Liaison Technologies, Incorporated
-liaison
-
 // lidl : 2014-09-18 Schwarz Domains und Services GmbH & Co. KG
 lidl
 
@@ -8922,7 +8938,7 @@ maif
 // maison : 2013-12-05 Binky Moon, LLC
 maison
 
-// makeup : 2015-01-15 L'Oréal
+// makeup : 2015-01-15 XYZ.COM LLC
 makeup
 
 // man : 2014-12-04 MAN SE
@@ -9066,9 +9082,6 @@ mov
 // movie : 2015-02-05 Binky Moon, LLC
 movie
 
-// movistar : 2014-10-16 Telefónica S.A.
-movistar
-
 // msd : 2015-07-23 MSD Registry Holdings, Inc.
 msd
 
@@ -9768,7 +9781,7 @@ site
 // ski : 2015-04-09 Afilias Limited
 ski
 
-// skin : 2015-01-15 L'Oréal
+// skin : 2015-01-15 XYZ.COM LLC
 skin
 
 // sky : 2014-06-19 Sky International AG
@@ -9963,9 +9976,6 @@ tech
 // technology : 2013-09-13 Binky Moon, LLC
 technology
 
-// telefonica : 2014-10-16 Telefónica S.A.
-telefonica
-
 // temasek : 2014-08-07 Temasek Holdings (Private) Limited
 temasek
 
@@ -10407,6 +10417,9 @@ xin
 // xn--cck2b3b : 2015-02-26 Amazon Registry Services, Inc.
 ストア
 
+// xn--cckwcxetd : 2019-12-19 Amazon EU S.à r.l.
+アマゾン
+
 // xn--cg4bki : 2013-09-27 SAMSUNG SDS CO., LTD
 삼성
 
@@ -10476,6 +10489,9 @@ xin
 // xn--j1aef : 2015-01-15 VeriSign Sarl
 ком
 
+// xn--jlq480n2rg : 2019-12-19 Amazon EU S.à r.l.
+亚马逊
+
 // xn--jlq61u9w7b : 2015-01-08 Nokia Corporation
 诺基亚
 
@@ -10536,7 +10552,7 @@ xin
 // xn--nyqy26a : 2014-11-07 Stable Tone Limited
 健康
 
-// xn--otu796d : 2017-08-06 Internet DotTrademark Organisation Limited
+// xn--otu796d : 2017-08-06 Jiang Yu Liang Cai Technology Company Limited
 招聘
 
 // xn--p1acf : 2013-12-12 Rusnames Limited
@@ -10611,7 +10627,7 @@ yahoo
 // yamaxun : 2014-12-18 Amazon Registry Services, Inc.
 yamaxun
 
-// yandex : 2014-04-10 YANDEX, LLC
+// yandex : 2014-04-10 Yandex Europe B.V.
 yandex
 
 // yodobashi : 2014-11-20 YODOBASHI CAMERA CO.,LTD.
@@ -10958,8 +10974,9 @@ certmgr.org
 xenapponazure.com
 
 // Civilized Discourse Construction Kit, Inc. : https://www.discourse.org/
-// Submitted by Rishabh Nambiar <rishabh.nambiar@discourse.org>
+// Submitted by Rishabh Nambiar & Michael Brown <team@discourse.org>
 discourse.group
+discourse.team
 
 // ClearVox : http://www.clearvox.nl/
 // Submitted by Leon Rowland <leon@clearvox.nl>
@@ -11689,6 +11706,7 @@ vologda.su
 // Fancy Bits, LLC : http://getchannels.com
 // Submitted by Aman Gupta <aman@getchannels.com>
 channelsdvr.net
+u.channelsdvr.net
 
 // Fastly Inc. : http://www.fastly.com/
 // Submitted by Fastly Security <security@fastly.com>
@@ -12609,6 +12627,10 @@ pubtls.org
 // Submitted by Xavier De Cock <xdecock@gmail.com>
 qualifioapp.com
 
+// QuickBackend: https://www.quickbackend.com
+// Submitted by Dani Biro <dani@pymet.com>
+qbuser.com
+
 // Redstar Consultants : https://www.redstarconsultants.com/
 // Submitted by Jons Slemmer <jons@redstarconsultants.com>
 instantcloud.cn
@@ -12723,6 +12745,10 @@ my-firewall.org
 myfirewall.org
 spdns.org
 
+// Senseering GmbH : https://www.senseering.de
+// Submitted by Felix Mönckemeyer <f.moenckemeyer@senseering.de>
+senseering.net
+
 // Service Online LLC : http://drs.ua/
 // Submitted by Serhii Bulakh <support@drs.ua>
 biz.ua
@@ -12993,6 +13019,14 @@ remotewd.com
 // Submitted by Yuvi Panda <yuvipanda@wikimedia.org>
 wmflabs.org
 
+// WoltLab GmbH : https://www.woltlab.com
+// Submitted by Tim Düsterhus <security@woltlab.cloud>
+myforum.community
+community-pro.de
+diskussionsbereich.de
+community-pro.net
+meinforum.net
+
 // XenonCloud GbR: https://xenoncloud.net
 // Submitted by Julian Uphoff <publicsuffixlist@xenoncloud.net>
 half.host

net/base/registry_controlled_domains/effective_tld_names.gperf

@@ -80,6 +80,7 @@ ac.ci, 0
 ac.cn, 0
 ac.cr, 0
 ac.cy, 0
+ac.fj, 0
 ac.gn, 0
 ac.gov.br, 0
 ac.id, 0
@@ -272,6 +273,7 @@ ama.shimane.jp, 0
 amagasaki.hyogo.jp, 0
 amakusa.kumamoto.jp, 0
 amami.kagoshima.jp, 0
+amazon, 0
 amber.museum, 0
 ambulance.aero, 0
 ambulance.museum, 0
@@ -722,6 +724,7 @@ biz.bb, 0
 biz.cy, 0
 biz.dk, 4
 biz.et, 0
+biz.fj, 0
 biz.gl, 4
 biz.id, 0
 biz.ki, 0
@@ -1424,6 +1427,7 @@ com.ee, 0
 com.eg, 0
 com.es, 0
 com.et, 0
+com.fj, 0
 com.fr, 0
 com.ge, 0
 com.gh, 0
@@ -1527,6 +1531,8 @@ commune.am, 0
 communication.museum, 0
 communications.museum, 0
 community, 0
+community-pro.de, 4
+community-pro.net, 4
 community.museum, 0
 como.it, 0
 company, 0
@@ -1756,12 +1762,14 @@ direct.quickconnect.to, 4
 directory, 0
 discount, 0
 discourse.group, 4
+discourse.team, 4
 discover, 0
 discovery.museum, 0
 dish, 0
 diskstation.eu, 4
 diskstation.me, 4
 diskstation.org, 4
+diskussionsbereich.de, 4
 ditchyourip.com, 4
 divtasvuodna.no, 0
 divttasvuotna.no, 0
@@ -2113,7 +2121,6 @@ environment.museum, 0
 environmentalconservation.museum, 0
 epilepsy.museum, 0
 epson, 0
-eq.edu.au, 0
 equipment, 0
 equipment.aero, 0
 er, 2
@@ -2288,7 +2295,7 @@ fishing, 0
 fit, 0
 fitjar.no, 0
 fitness, 0
-fj, 2
+fj, 0
 fj.cn, 0
 fjaler.no, 0
 fjell.no, 0
@@ -2764,6 +2771,7 @@ gov.ec, 0
 gov.ee, 0
 gov.eg, 0
 gov.et, 0
+gov.fj, 0
 gov.ge, 0
 gov.gh, 0
 gov.gi, 0
@@ -3405,6 +3413,7 @@ info.co, 0
 info.cx, 4
 info.ec, 0
 info.et, 0
+info.fj, 0
 info.gu, 0
 info.ht, 0
 info.hu, 0
@@ -4276,7 +4285,6 @@ lg.ua, 0
 lgbt, 0
 li, 0
 li.it, 0
-liaison, 0
 lib.ak.us, 0
 lib.al.us, 0
 lib.ar.us, 0
@@ -4618,6 +4626,7 @@ meet, 0
 meguro.tokyo.jp, 0
 mein-iserv.de, 4
 mein-vigor.de, 4
+meinforum.net, 4
 meiwa.gunma.jp, 0
 meiwa.mie.jp, 0
 meland.no, 0
@@ -4691,6 +4700,7 @@ mil.co, 0
 mil.do, 0
 mil.ec, 0
 mil.eg, 0
+mil.fj, 0
 mil.ge, 0
 mil.gh, 0
 mil.gt, 0
@@ -4918,7 +4928,6 @@ motoyama.kochi.jp, 0
 mov, 0
 movie, 0
 movimiento.bo, 0
-movistar, 0
 mozilla-iot.org, 4
 mp, 0
 mp.br, 0
@@ -5006,6 +5015,7 @@ mydrobo.com, 4
 myds.me, 4
 myeffect.net, 4
 myfirewall.org, 4
+myforum.community, 4
 myfritz.net, 4
 myftp.biz, 4
 myftp.org, 4
@@ -5098,6 +5108,7 @@ name.az, 0
 name.cy, 0
 name.eg, 0
 name.et, 0
+name.fj, 0
 name.hr, 0
 name.jo, 0
 name.mk, 0
@@ -5235,6 +5246,7 @@ net.ec, 0
 net.eg, 0
 net.et, 0
 net.eu.org, 4
+net.fj, 0
 net.ge, 0
 net.gg, 0
 net.gl, 0
@@ -5828,6 +5840,7 @@ org.ee, 0
 org.eg, 0
 org.es, 0
 org.et, 0
+org.fj, 0
 org.ge, 0
 org.gg, 0
 org.gh, 0
@@ -6249,6 +6262,7 @@ pro.az, 0
 pro.br, 0
 pro.cy, 0
 pro.ec, 0
+pro.fj, 0
 pro.ht, 0
 pro.mv, 0
 pro.na, 0
@@ -6310,6 +6324,7 @@ q-a.eu.org, 4
 q.bg, 0
 qa, 0
 qa2.com, 4
+qbuser.com, 4
 qc.ca, 0
 qc.com, 4
 qcx.io, 4
@@ -6818,6 +6833,7 @@ semine.miyagi.jp, 0
 sendai.jp, 2
 sener, 0
 sennan.osaka.jp, 0
+senseering.net, 4
 sensiosite.cloud, 6
 seoul.kr, 0
 sera.hiroshima.jp, 0
@@ -7420,7 +7436,6 @@ tele.amune.org, 4
 telebit.app, 4
 telebit.io, 4
 telebit.xyz, 6
-telefonica, 0
 telekommunikation.museum, 0
 television.museum, 0
 temasek, 0
@@ -7756,6 +7771,7 @@ tysnes.no, 0
 tysvar.no, 0
 tz, 0
 u.bg, 0
+u.channelsdvr.net, 4
 u.se, 0
 u2-local.xnbay.com, 4
 u2.xnbay.com, 4
@@ -8297,6 +8313,7 @@ xn--c1avg.xn--90a3ac, 0
 xn--c2br7g, 0
 xn--c3s14m.jp, 0
 xn--cck2b3b, 0
+xn--cckwcxetd, 0
 xn--cesena-forl-mcb.it, 0
 xn--cesenaforl-i8a.it, 0
 xn--cg4bki, 0
@@ -8388,6 +8405,7 @@ xn--io0a7i.hk, 0
 xn--j1aef, 0
 xn--j1amh, 0
 xn--j6w193g, 0
+xn--jlq480n2rg, 0
 xn--jlq61u9w7b, 0
 xn--jlster-bya.no, 0
 xn--jrpeland-54a.no, 0
@@ -8525,6 +8543,7 @@ xn--pssy2u, 0
 xn--q9jyb4c, 0
 xn--qcka1pmc, 0
 xn--qqqt11m.jp, 0
+xn--qxa6a, 0
 xn--qxam, 0
 xn--rady-ira.no, 0
 xn--rdal-poa.no, 0

net/tools/tld_cleanup/README

@@ -14,13 +14,16 @@ When updating src/net/base/registry_controlled_domains/effective_tld_names.dat:
 // Chromium note: this is based on Mozilla's file:
 // https://publicsuffix.org/list/public_suffix_list.dat
 
-4. Build tld_cleanup (the "(net)" > "tld_cleanup" project)
+4. Diff the changes and restore any changes annotated with a "// CHROMIUM"
+   comment.
 
-5. Run it (no arguments needed), typically from src/build/Release or
+5. Build tld_cleanup (the "(net)" > "tld_cleanup" project)
+
+6. Run it (no arguments needed), typically from src/build/Release or
    src/build/Debug. It will re-generate
    src/net/base/registry_controlled_domains/effective_tld_names.gperf.
 
-6. Check in the updated effective_tld_names.dat, effective_tld_names.gperf
+7. Check in the updated effective_tld_names.dat, effective_tld_names.gperf
 
 Note that gperf is no longer used for effective_tld_names, but when building
 chromium the file effective_tld_names.gperf will be parsed by make_dafsa.py