3 files changed, 326 insertions, 49 deletions
diff --git a/net/base/effective_tld_names.dat b/net/base/effective_tld_names.dat
index 8d78c1b..0091d4e 100644
--- a/net/base/effective_tld_names.dat
+++ b/net/base/effective_tld_names.dat
@@ -19,7 +19,7 @@
 // the Initial Developer. All Rights Reserved.
 //
 // Contributor(s):
-//   Ruben Arakelyan <ruben@wackomenace.co.uk>
+//   Ruben Arakelyan <ruben@rubenarakelyan.com>
 //   Gervase Markham <gerv@gerv.net>
 //   Pamela Greene <pamg.bugs@gmail.com>
 //   David Triendl <david@triendl.name>
@@ -699,30 +699,36 @@ com
 
 // CentralNic names : http://www.centralnic.com/names/domains
 // Confirmed by registry <gavin.brown@centralnic.com> 2008-06-09
-ar.com
-br.com
-cn.com
-de.com
-eu.com
-gb.com
-hu.com
-jpn.com
-kr.com
-no.com
-qc.com
-ru.com
-sa.com
-se.com
-uk.com
-us.com
-uy.com
-za.com
+// All removed in Chromium: see
+// https://bugzilla.mozilla.org/show_bug.cgi?id=687165
+// ar.com
+// br.com
+// cn.com
+// de.com
+// eu.com
+// gb.com
+// hu.com
+// jpn.com
+// kr.com
+// no.com
+// qc.com
+// ru.com
+// sa.com
+// se.com
+// uk.com
+// us.com
+// uy.com
+// za.com
 
 // Requested by Yngve Pettersen <yngve@opera.com> 2009-11-26
-operaunite.com
+// Removed in Chromium: see http://crbug.com/96086 and
+// https://bugzilla.mozilla.org/show_bug.cgi?id=687165
+// operaunite.com
 
 // Requested by Eduardo Vela <evn@google.com> 2010-09-06
-appspot.com
+// Removed in Chromium: see http://crbug.com/96086 and
+// https://bugzilla.mozilla.org/show_bug.cgi?id=687165
+// appspot.com
 
 // coop : http://en.wikipedia.org/wiki/.coop
 coop
@@ -4410,7 +4416,6 @@ or.ug
 !bl.uk
 !british-library.uk
 !icnet.uk
-!gov.uk
 !jet.uk
 !mod.uk
 !nel.uk
@@ -4910,3 +4915,286 @@ xxx
 
 // zw : http://en.wikipedia.org/wiki/.zw
 *.zw
+
+// DynDNS.com Dynamic DNS zones : http://www.dyndns.com/services/dns/dyndns/
+// All removed in Chromium: see http://crbug.com/96086 and
+// https://bugzilla.mozilla.org/show_bug.cgi?id=687165
+// dyndns-at-home.com
+// dyndns-at-work.com
+// dyndns-blog.com
+// dyndns-free.com
+// dyndns-home.com
+// dyndns-ip.com
+// dyndns-mail.com
+// dyndns-office.com
+// dyndns-pics.com
+// dyndns-remote.com
+// dyndns-server.com
+// dyndns-web.com
+// dyndns-wiki.com
+// dyndns-work.com
+// dyndns.biz
+// dyndns.info
+// dyndns.org
+// dyndns.tv
+// at-band-camp.net
+// ath.cx
+// barrel-of-knowledge.info
+// barrell-of-knowledge.info
+// better-than.tv
+// blogdns.com
+// blogdns.net
+// blogdns.org
+// blogsite.org
+// boldlygoingnowhere.org
+// broke-it.net
+// buyshouses.net
+// cechire.com
+// dnsalias.com
+// dnsalias.net
+// dnsalias.org
+// dnsdojo.com
+// dnsdojo.net
+// dnsdojo.org
+// does-it.net
+// doesntexist.com
+// doesntexist.org
+// dontexist.com
+// dontexist.net
+// dontexist.org
+// doomdns.com
+// doomdns.org
+// dvrdns.org
+// dyn-o-saur.com
+// dynalias.com
+// dynalias.net
+// dynalias.org
+// dynathome.net
+// dyndns.ws
+// endofinternet.net
+// endofinternet.org
+// endoftheinternet.org
+// est-a-la-maison.com
+// est-a-la-masion.com
+// est-le-patron.com
+// est-mon-blogueur.com
+// for-better.biz
+// for-more.biz
+// for-our.info
+// for-some.biz
+// for-the.biz
+// forgot.her.name
+// forgot.his.name
+// from-ak.com
+// from-al.com
+// from-ar.com
+// from-az.net
+// from-ca.com
+// from-co.net
+// from-ct.com
+// from-dc.com
+// from-de.com
+// from-fl.com
+// from-ga.com
+// from-hi.com
+// from-ia.com
+// from-id.com
+// from-il.com
+// from-in.com
+// from-ks.com
+// from-ky.com
+// from-la.net
+// from-ma.com
+// from-md.com
+// from-me.org
+// from-mi.com
+// from-mn.com
+// from-mo.com
+// from-ms.com
+// from-mt.com
+// from-nc.com
+// from-nd.com
+// from-ne.com
+// from-nh.com
+// from-nj.com
+// from-nm.com
+// from-nv.com
+// from-ny.net
+// from-oh.com
+// from-ok.com
+// from-or.com
+// from-pa.com
+// from-pr.com
+// from-ri.com
+// from-sc.com
+// from-sd.com
+// from-tn.com
+// from-tx.com
+// from-ut.com
+// from-va.com
+// from-vt.com
+// from-wa.com
+// from-wi.com
+// from-wv.com
+// from-wy.com
+// ftpaccess.cc
+// fuettertdasnetz.de
+// game-host.org
+// game-server.cc
+// getmyip.com
+// gets-it.net
+// go.dyndns.org
+// gotdns.com
+// gotdns.org
+// groks-the.info
+// groks-this.info
+// ham-radio-op.net
+// here-for-more.info
+// hobby-site.com
+// hobby-site.org
+// home.dyndns.org
+// homedns.org
+// homeftp.net
+// homeftp.org
+// homeip.net
+// homelinux.com
+// homelinux.net
+// homelinux.org
+// homeunix.com
+// homeunix.net
+// homeunix.org
+// iamallama.com
+// in-the-band.net
+// is-a-anarchist.com
+// is-a-blogger.com
+// is-a-bookkeeper.com
+// is-a-bruinsfan.org
+// is-a-bulls-fan.com
+// is-a-candidate.org
+// is-a-caterer.com
+// is-a-celticsfan.org
+// is-a-chef.com
+// is-a-chef.net
+// is-a-chef.org
+// is-a-conservative.com
+// is-a-cpa.com
+// is-a-cubicle-slave.com
+// is-a-democrat.com
+// is-a-designer.com
+// is-a-doctor.com
+// is-a-financialadvisor.com
+// is-a-geek.com
+// is-a-geek.net
+// is-a-geek.org
+// is-a-green.com
+// is-a-guru.com
+// is-a-hard-worker.com
+// is-a-hunter.com
+// is-a-knight.org
+// is-a-landscaper.com
+// is-a-lawyer.com
+// is-a-liberal.com
+// is-a-libertarian.com
+// is-a-linux-user.org
+// is-a-llama.com
+// is-a-musician.com
+// is-a-nascarfan.com
+// is-a-nurse.com
+// is-a-painter.com
+// is-a-patsfan.org
+// is-a-personaltrainer.com
+// is-a-photographer.com
+// is-a-player.com
+// is-a-republican.com
+// is-a-rockstar.com
+// is-a-socialist.com
+// is-a-soxfan.org
+// is-a-student.com
+// is-a-teacher.com
+// is-a-techie.com
+// is-a-therapist.com
+// is-an-accountant.com
+// is-an-actor.com
+// is-an-actress.com
+// is-an-anarchist.com
+// is-an-artist.com
+// is-an-engineer.com
+// is-an-entertainer.com
+// is-by.us
+// is-certified.com
+// is-found.org
+// is-gone.com
+// is-into-anime.com
+// is-into-cars.com
+// is-into-cartoons.com
+// is-into-games.com
+// is-leet.com
+// is-lost.org
+// is-not-certified.com
+// is-saved.org
+// is-slick.com
+// is-uberleet.com
+// is-very-bad.org
+// is-very-evil.org
+// is-very-good.org
+// is-very-nice.org
+// is-very-sweet.org
+// is-with-theband.com
+// isa-geek.com
+// isa-geek.net
+// isa-geek.org
+// isa-hockeynut.com
+// issmarterthanyou.com
+// isteingeek.de
+// istmein.de
+// kicks-ass.net
+// kicks-ass.org
+// knowsitall.info
+// land-4-sale.us
+// lebtimnetz.de
+// leitungsen.de
+// likes-pie.com
+// likescandy.com
+// merseine.nu
+// mine.nu
+// misconfused.org
+// mypets.ws
+// myphotos.cc
+// neat-url.com
+// office-on-the.net
+// on-the-web.tv
+// podzone.net
+// podzone.org
+// readmyblog.org
+// saves-the-whales.com
+// scrapper-site.net
+// scrapping.cc
+// selfip.biz
+// selfip.com
+// selfip.info
+// selfip.net
+// selfip.org
+// sells-for-less.com
+// sells-for-u.com
+// sells-it.net
+// sellsyourhome.org
+// servebbs.com
+// servebbs.net
+// servebbs.org
+// serveftp.net
+// serveftp.org
+// servegame.org
+// shacknet.nu
+// simple-url.com
+// space-to-rent.com
+// stuff-4-sale.org
+// stuff-4-sale.us
+// teaches-yoga.com
+// thruhere.net
+// traeumtgerade.de
+// webhop.biz
+// webhop.info
+// webhop.net
+// webhop.org
+// worse-than.tv
+// writesthisblog.com
diff --git a/net/base/effective_tld_names.gperf b/net/base/effective_tld_names.gperf
index beaf160..1d47854 100644
--- a/net/base/effective_tld_names.gperf
+++ b/net/base/effective_tld_names.gperf
@@ -1,5 +1,5 @@
 %{
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
@@ -166,13 +166,11 @@ aomori.jp, 2
 aosta.it, 0
 aoste.it, 0
 ap.it, 0
-appspot.com, 0
 aq, 0
 aq.it, 0
 aquarium.museum, 0
 aquila.it, 0
 ar, 2
-ar.com, 0
 ar.it, 0
 ar.us, 0
 arboretum.museum, 0
@@ -396,7 +394,6 @@ botanicgarden.museum, 0
 botany.museum, 0
 bozen.it, 0
 br, 0
-br.com, 0
 br.it, 0
 brand.se, 0
 brandywinevalley.museum, 0
@@ -614,7 +611,6 @@ club.tw, 0
 cm, 0
 cmw.ru, 0
 cn, 0
-cn.com, 0
 cn.it, 0
 cn.ua, 0
 cng.br, 0
@@ -853,7 +849,6 @@ davvesiida.no, 0
 dc.us, 0
 ddr.museum, 0
 de, 0
-de.com, 0
 de.us, 0
 deatnu.no, 0
 decorativearts.museum, 0
@@ -1066,7 +1061,6 @@ eti.br, 0
 etne.no, 0
 etnedal.no, 0
 eu, 0
-eu.com, 0
 eu.int, 0
 eun.eg, 0
 evenassi.no, 0
@@ -1211,7 +1205,6 @@ garden.museum, 0
 gateway.museum, 0
 gaular.no, 0
 gausdal.no, 0
-gb.com, 0
 gb.net, 0
 gc.ca, 0
 gd, 0
@@ -1395,7 +1388,6 @@ gov.to, 0
 gov.tt, 0
 gov.tw, 0
 gov.ua, 0
-gov.uk, 1
 gov.vc, 0
 gov.vn, 0
 gov.ws, 0
@@ -1547,7 +1539,6 @@ hr, 0
 hs.kr, 0
 ht, 0
 hu, 0
-hu.com, 0
 huissier-justice.fr, 0
 humanities.museum, 0
 hurdal.no, 0
@@ -1709,7 +1700,6 @@ journal.aero, 0
 journalism.museum, 0
 journalist.aero, 0
 jp, 0
-jpn.com, 0
 js.cn, 0
 judaica.museum, 0
 judygarland.museum, 0
@@ -1851,7 +1841,6 @@ kopervik.no, 0
 kostroma.ru, 0
 kp, 0
 kr, 0
-kr.com, 0
 kr.it, 0
 kr.ua, 0
 kraanghke.no, 0
@@ -2507,7 +2496,6 @@ nm.cn, 0
 nm.us, 0
 nnov.ru, 0
 no, 0
-no.com, 0
 no.it, 0
 nom.ad, 0
 nom.ag, 0
@@ -2609,7 +2597,6 @@ on.ca, 0
 online.museum, 0
 ontario.museum, 0
 openair.museum, 0
-operaunite.com, 0
 opoczno.pl, 0
 opole.pl, 0
 oppdal.no, 0
@@ -2991,7 +2978,6 @@ pz.it, 0
 q.bg, 0
 qa, 2
 qc.ca, 0
-qc.com, 0
 qh.cn, 0
 qld.au, 0
 qld.edu.au, 0
@@ -3089,7 +3075,6 @@ royrvik.no, 0
 rs, 0
 rs.ba, 0
 ru, 0
-ru.com, 0
 rubtsovsk.ru, 0
 ruovat.no, 0
 russia.museum, 0
@@ -3103,7 +3088,6 @@ s.bg, 0
 s.se, 0
 sa, 0
 sa.au, 0
-sa.com, 0
 sa.cr, 0
 sa.edu.au, 0
 sa.gov.au, 0
@@ -3185,7 +3169,6 @@ sd, 0
 sd.cn, 0
 sd.us, 0
 se, 0
-se.com, 0
 se.net, 0
 seaport.museum, 0
 sebastopol.ua, 0
@@ -3548,7 +3531,6 @@ ug, 0
 ug.gov.pl, 0
 uhren.museum, 0
 uk, 2
-uk.com, 0
 uk.net, 0
 ulan-ude.ru, 0
 ullensaker.no, 0
@@ -3570,7 +3552,6 @@ urbinopesaro.it, 0
 uri.arpa, 0
 urn.arpa, 0
 us, 0
-us.com, 0
 us.na, 0
 usa.museum, 0
 usantiques.museum, 0
@@ -3591,7 +3572,6 @@ utsira.no, 0
 uvic.museum, 0
 uw.gov.pl, 0
 uy, 2
-uy.com, 0
 uz, 0
 uzhgorod.ua, 0
 v.bg, 0
@@ -4007,7 +3987,6 @@ yuzhno-sakhalinsk.ru, 0
 z.bg, 0
 z.se, 0
 za, 2
-za.com, 0
 za.net, 0
 za.org, 0
 zachpomor.pl, 0
diff --git a/net/tools/tld_cleanup/README b/net/tools/tld_cleanup/README
index f696843..03cd56f 100644
--- a/net/tools/tld_cleanup/README
+++ b/net/tools/tld_cleanup/README
@@ -1,12 +1,22 @@
 When updating src/net/base/effective_tld_names.dat:
 
-1. Build tld_cleanup.exe (the "(net)" > "tld_cleanup" project)
-2. Run it (no arguments needed), typically from src/chrome/Release or
-   src/chrome/Debug. It will re-generate
+1. Obtain the new effective_tld_names.dat, probably by downloading
+   http://goo.gl/Ji2bB
+
+2. Remove whitespace from the ends of the lines.
+
+3. Add the Chromium note back in.
+
+4. Build tld_cleanup.exe (the "(net)" > "tld_cleanup" project)
+
+5. Run it (no arguments needed), typically from src/build/Release or
+   src/build/Debug. It will re-generate
    src/net/base/effective_tld_names.gperf.
-3. Run gperf on the new effective_tld_names.gperf:
+
+6. Run gperf on the new effective_tld_names.gperf:
      gperf -a -L "C++" -C -c -o -t -k '*' -NFindDomain -D -m 5 \
         effective_tld_names.gperf > effective_tld_names.cc
    It will produce a new effective_tld_names.cc.
-4. 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,
    and effective_tld_names.cc together.