Fixing bug in address rewriter rules

This is done with the internal generator script @134450902 with
cr/264390460.

Bug: 995865
Change-Id: Ia7a485d39bcd80a6ca28e2519ea4e1c716c62354
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1761443Reviewed-by: Roger McFarlane <rogerm@chromium.org>
Commit-Queue: Sam Maier <smaier@chromium.org>
Cr-Commit-Position: refs/heads/master@{#689078}

components/autofill/core/browser/address_rewrite_rules/AU.txt

@@ -12,29 +12,29 @@
 \bvictoria\b	vic
 \bhighway\b	hwy
 \bparkway\b	pkwy
-\ba\\.c\\.t\\.\b	act
-\bau\\-act\b	act
-\bau\\-jbt\b	jbt
-\bau\\-nsw\b	nsw
-\bau\\-qld\b	qld
-\bau\\-tas\b	tas
-\bau\\-vic\b	vic
+\ba\.c\.t\.\b	act
+\bau\-act\b	act
+\bau\-jbt\b	jbt
+\bau\-nsw\b	nsw
+\bau\-qld\b	qld
+\bau\-tas\b	tas
+\bau\-vic\b	vic
 \bavenue\b	ave
 \bcommon\b	comm
-\bj\\.b\\.t\\.\b	jbt
-\bn\\.s\\.w\\.\b	nsw
+\bj\.b\.t\.\b	jbt
+\bn\.s\.w\.\b	nsw
 \bparade\b	pde
 \bstreet\b	st
-\ba\\.c\\.t\b	act
-\bau\\-nt\b	nt
-\bau\\-sa\b	sa
-\bau\\-wa\b	wa
+\ba\.c\.t\b	act
+\bau\-nt\b	nt
+\bau\-sa\b	sa
+\bau\-wa\b	wa
 \bcourt\b	ct
 \bdrive\b	dr
 \beight\b	8
-\bj\\.b\\.t\b	jbt
+\bj\.b\.t\b	jbt
 \bmount\b	mt
-\bn\\.s\\.w\b	nsw
+\bn\.s\.w\b	nsw
 \bnorth\b	n
 \bplace\b	pl
 \bpoint\b	pt
@@ -46,26 +46,26 @@
 \bfive\b	5
 \bfour\b	4
 \blane\b	ln
-\bn\\.t\\.\b	nt
+\bn\.t\.\b	nt
 \bnine\b	9
 \broad\b	rd
-\bs\\.a\\.\b	sa
-\bw\\.a\\.\b	wa
+\bs\.a\.\b	sa
+\bw\.a\.\b	wa
 \bwest\b	w
 \baus\b	au
-\bmt\\.\b	mt
-\bn\\.t\b	nt
+\bmt\.\b	mt
+\bn\.t\b	nt
 \bnth\b	n
 \bone\b	1
-\bpt\\.\b	pt
-\bs\\.a\b	sa
+\bpt\.\b	pt
+\bs\.a\b	sa
 \bsix\b	6
-\bst\\.\b	st
+\bst\.\b	st
 \bsth\b	s
 \bten\b	10
 \btwo\b	2
-\bw\\.a\b	wa
-\be\\.\b	e
-\bn\\.\b	n
-\bs\\.\b	s
-\bw\\.\b	w
+\bw\.a\b	wa
+\be\.\b	e
+\bn\.\b	n
+\bs\.\b	s
+\bw\.\b	w

components/autofill/core/browser/address_rewrite_rules/CA.txt

@@ -17,7 +17,7 @@
 \bprince\s+edward\s+island\b	pe
 \bregional\s+district\s+of\b	
 \bfrench\s+village\s+york\b	french village
-\bhead\s+of\s+bay\s+despoir\b	head bay d\'espoir
+\bhead\s+of\s+bay\s+despoir\b	head bay d'espoir
 \bterritoire\s+du\s+yukon\b	yt
 \bnouveau\s+brunswick\b	nb
 \bregional\s+district\b	
@@ -47,14 +47,14 @@
 \bbelliveaus\b	belliveau
 \bconcession\b	conc
 \bcul\s+de\s+sac\b	cds
-\bcul\\-de\\-sac\b	cds
+\bcul\-de\-sac\b	cds
 \bde\s+riviere\b	riviere
 \bexpressway\b	expy
 \bmackinnons\b	mckinnons
 \bnorth\s+side\b	northside
 \bpine\s+ridge\b	pineridge
 \brond\s+point\b	rdpt
-\brond\\-point\b	rdpt
+\brond\-point\b	rdpt
 \balternate\b	alt
 \bautoroute\b	aut
 \bboulevard\b	blvd

components/autofill/core/browser/address_rewrite_rules/CH.txt

@@ -37,7 +37,7 @@
 \bsaint\s+gall\b	sg
 \bsan\s+gallen\b	sg
 \bsankt\s+gall\b	sg
-\bst\\.\s+gallen\b	sg
+\bst\.\s+gallen\b	sg
 \bvaud\s+waadt\b	vd
 \bwaadt\s+vaud\b	vd
 \bcinquieme\b	5
@@ -51,13 +51,13 @@
 \bsciaffusa\b	sh
 \bsolothurn\b	so
 \bst\s+gallen\b	sg
-\bst\\.\s+gallo\b	sg
+\bst\.\s+gallo\b	sg
 \bthurgovia\b	tg
 \bthurgovie\b	tg
 \btreizieme\b	13
 \btroisieme\b	3
 \bvingtieme\b	20
-\bd\\\\\'uster\b	uster
+\bd\\\'uster\b	uster
 \bdeuxieme\b	2
 \bdouzieme\b	12
 \bfreiburg\b	fr
@@ -72,10 +72,10 @@
 \bobwalden\b	ow
 \bpremiere\b	1
 \bsan\s+gall\b	sg
-\bseizieme\b	16
+\bseizième\b	16
 \bseptieme\b	7
 \bst\s+gallo\b	sg
-\bst\\.\s+gall\b	sg
+\bst\.\s+gall\b	sg
 \bturgovia\b	tg
 \bzofingue\b	zofingen
 \bargovia\b	ag

components/autofill/core/browser/address_rewrite_rules/ES.txt

@@ -80,8 +80,8 @@
 \bleon\b	le
 \blugo\b	lu
 \bwest\b	o
-\bc\\.\\/\b	c
-\bc\\/\\.\b	c
+\bc\.\/\b	c
+\bc\/\.\b	c
 \bdal\b	
 \bdel\b	
 \blas\b	
@@ -89,7 +89,7 @@
 \blos\b	
 \bsur\b	s
 \bal\b	
-\bc\\/\b	c
+\bc\/\b	c
 \bde\b	
 \bel\b	
 \ben\b	

components/autofill/core/browser/address_rewrite_rules/FR.txt

@@ -93,7 +93,7 @@
 \bneuvieme\b	9
 \bpicardie\b	s
 \bpremiere\b	1
-\bseizieme\b	16
+\bseizième\b	16
 \bseptieme\b	7
 \bvaucluse\b	84
 \byvelines\b	78

components/autofill/core/browser/address_rewrite_rules/GB.txt

@@ -16,7 +16,7 @@
 \bcentral\s+bedfordshire\b	gb-cbf
 \bkingston\s+upon\s+thames\b	gb-ktt
 \bredcar\s+and\s+cleveland\b	gb-rcc
-\brhondda\\,\s+cynon\\,\s+taff\b	gb-rct
+\brhondda\,\s+cynon\,\s+taff\b	gb-rct
 \brichmond\s+upon\s+thames\b	gb-ric
 \bthe\s+scottish\s+borders\b	gb-scb
 \beast\s+dunbartonshire\b	gb-edu
@@ -41,7 +41,7 @@
 \bnorthamptonshire\b	gb-nth
 \bnorthern\s+ireland\b	n.i.
 \bshetland\s+islands\b	gb-zet
-\bstockton\\-on\\-tees\b	gb-stt
+\bstockton\-on\-tees\b	gb-stt
 \bargyll\s+and\s+bute\b	gb-agb
 \bbuckinghamshire\b	gb-bkm
 \bcarmarthenshire\b	gb-cmn
@@ -50,7 +50,7 @@
 \bnorth\s+yorkshire\b	gb-nyk
 \bnottinghamshire\b	gb-ntt
 \bsefton\s+district\b	gb-sft
-\bsouthend\\-on\\-sea\b	gb-sos
+\bsouthend\-on\-sea\b	gb-sos
 \bcambridgeshire\b	gb-cam
 \bcity\s+of\s+london\b	gb-lnd
 \bleeds\s+district\b	gb-lds
@@ -63,7 +63,7 @@
 \borkney\s+islands\b	gb-ork
 \bsouth\s+ayrshire\b	gb-say
 \bsouth\s+tyneside\b	gb-sty
-\bstoke\\-on\\-trent\b	gb-ste
+\bstoke\-on\-trent\b	gb-ste
 \bwaltham\s+forest\b	gb-wft
 \bwest\s+berkshire\b	gb-wbk
 \bworcestershire\b	gb-wor
@@ -123,12 +123,12 @@
 \blancashire\b	gb-lan
 \bmanchester\b	gb-man
 \bmidlothian\b	gb-mln
-\bn\\.\s+ireland\b	n.i.
+\bn\.\s+ireland\b	n.i.
 \bnorth\s+down\b	gb-ndn
 \bnottingham\b	gb-ngm
 \bportsmouth\b	gb-por
 \bshropshire\b	gb-shr
-\bst\\.\s+helens\b	gb-shn
+\bst\.\s+helens\b	gb-shn
 \bsunderland\b	gb-snd
 \bwandsworth\b	gb-wnd
 \bwarrington\b	gb-wrt
@@ -147,7 +147,7 @@
 \bislington\b	gb-isl
 \bleicester\b	gb-lce
 \bn\s+ireland\b	n.i.
-\bn\\.ireland\b	n.i.
+\bn\.ireland\b	n.i.
 \bredbridge\b	gb-rdb
 \brotherham\b	gb-rot
 \bsheffield\b	gb-shf
@@ -214,39 +214,39 @@
 \bwrexham\b	gb-wrx
 \bavenue\b	ave
 \bcommon\b	comm
-\bgb\\-ans\b	angus
-\bgb\\-ant\b	antrim
-\bgb\\-ard\b	ards
-\bgb\\-arm\b	armagh
-\bgb\\-ben\b	brent
-\bgb\\-bex\b	bexley
-\bgb\\-bne\b	barnet
-\bgb\\-bol\b	bolton
-\bgb\\-bur\b	bury
-\bgb\\-cmd\b	camden
-\bgb\\-cwy\b	conwy
-\bgb\\-der\b	derby
-\bgb\\-dev\b	devon
-\bgb\\-dor\b	dorset
-\bgb\\-dow\b	down
-\bgb\\-dry\b	derry
-\bgb\\-dud\b	dudley
-\bgb\\-eal\b	ealing
-\bgb\\-eng\b	eng
-\bgb\\-ess\b	essex
-\bgb\\-fif\b	fife
-\bgb\\-ken\b	kent
-\bgb\\-lrn\b	larne
-\bgb\\-lut\b	luton
-\bgb\\-mry\b	moray
-\bgb\\-myl\b	moyle
-\bgb\\-nir\b	n.i.
-\bgb\\-omh\b	omagh
-\bgb\\-pol\b	poole
-\bgb\\-pow\b	powys
-\bgb\\-wgn\b	wigan
-\bgb\\-wls\b	wales
-\bgb\\-yor\b	york
+\bgb\-ans\b	angus
+\bgb\-ant\b	antrim
+\bgb\-ard\b	ards
+\bgb\-arm\b	armagh
+\bgb\-ben\b	brent
+\bgb\-bex\b	bexley
+\bgb\-bne\b	barnet
+\bgb\-bol\b	bolton
+\bgb\-bur\b	bury
+\bgb\-cmd\b	camden
+\bgb\-cwy\b	conwy
+\bgb\-der\b	derby
+\bgb\-dev\b	devon
+\bgb\-dor\b	dorset
+\bgb\-dow\b	down
+\bgb\-dry\b	derry
+\bgb\-dud\b	dudley
+\bgb\-eal\b	ealing
+\bgb\-eng\b	eng
+\bgb\-ess\b	essex
+\bgb\-fif\b	fife
+\bgb\-ken\b	kent
+\bgb\-lrn\b	larne
+\bgb\-lut\b	luton
+\bgb\-mry\b	moray
+\bgb\-myl\b	moyle
+\bgb\-nir\b	n.i.
+\bgb\-omh\b	omagh
+\bgb\-pol\b	poole
+\bgb\-pow\b	powys
+\bgb\-wgn\b	wigan
+\bgb\-wls\b	wales
+\bgb\-yor\b	york
 \bhalton\b	gb-hal
 \bharrow\b	gb-hrw
 \bmedway\b	gb-mdw
@@ -269,20 +269,20 @@
 \bsaint\b	st
 \bsouth\b	s
 \beast\b	e
-\bg\\.b\\.\b	gb
+\bg\.b\.\b	gb
 \blane\b	ln
 \broad\b	rd
-\bu\\.k\\.\b	gb
+\bu\.k\.\b	gb
 \bwest\b	w
-\bg\\.b\b	gb
-\bmt\\.\b	mt
+\bg\.b\b	gb
+\bmt\.\b	mt
 \bnth\b	n
-\bpt\\.\b	pt
-\bst\\.\b	st
+\bpt\.\b	pt
+\bst\.\b	st
 \bsth\b	s
-\bu\\.k\b	gb
-\be\\.\b	e
-\bn\\.\b	n
-\bs\\.\b	s
+\bu\.k\b	gb
+\be\.\b	e
+\bn\.\b	n
+\bs\.\b	s
 \buk\b	gb
-\bw\\.\b	w
+\bw\.\b	w

components/autofill/core/browser/address_rewrite_rules/ID.txt

@@ -37,10 +37,10 @@
 \bxviii\b	18
 \baceh\b	ac
 \bbali\b	ba
-\bblk\\.\b	blk
+\bblk\.\b	blk
 \bblok\b	blk
 \beast\b	e
-\bjln\\.\b	jl
+\bjln\.\b	jl
 \briau\b	ri
 \broad\b	rd
 \bviii\b	8
@@ -48,9 +48,9 @@
 \bxiii\b	13
 \bxvii\b	17
 \biii\b	3
-\bjl\\.\b	jl
+\bjl\.\b	jl
 \bjln\b	jl
-\bno\\.\b	#
+\bno\.\b	#
 \bnum\b	#
 \bvii\b	7
 \bxii\b	12

components/autofill/core/browser/address_rewrite_rules/IN.txt

@@ -3,18 +3,18 @@
 \bjammu\s+and\s+kashmir\b	j&k
 \btiruvananthapuram\b	tvpm
 \bchandigarh\s+city\b	ch
-\bjammu\s+\\&\s+kashmir\b	j&k
+\bjammu\s+\&\s+kashmir\b	j&k
 \bgovt\s+of\s+india\b	goi
 \binternational\b	intl
 \bvisakhapatnam\b	vskp
 \bchickmagalur\b	chicmagalur
 \bchikmagaluru\b	chicmagalur
 \bchikmagalur\b	chicmagalur
-\bcross\\-roads\b	xrd
+\bcross\-roads\b	xrd
 \bpataliputra\b	patna
 \branga\s+reddy\b	rangareddi
 \bchandigarh\b	ch
-\bcross\\-road\b	xrd
+\bcross\-road\b	xrd
 \bcrossroads\b	xrd
 \bgovernment\b	goi
 \bpatliputra\b	patna
@@ -23,12 +23,12 @@
 \bahmedabad\b	ahd
 \bbangalore\b	blr
 \bbengaluru\b	blr
-\bchar\\-rast\b	chaurah
+\bchar\-rast\b	chaurah
 \bchaurasta\b	chaurah
 \bchourasta\b	chaurah
 \bcrossroad\b	xrd
 \bhyderabad\b	hyd
-\bi\\.n\\.d\\.i\\.a\b	in
+\bi\.n\.d\.i\.a\b	in
 \bvijaywada\b	bza
 \bcalcutta\b	kol
 \bchourast\b	chaurah
@@ -86,7 +86,7 @@
 \bgrden\b	gdn
 \bgtway\b	gtwy
 \bindia\b	in
-\bj\s+\\&\s+k\b	j&k
+\bj\s+\&\s+k\b	j&k
 \bmukku\b	jn.
 \bnaaka\b	jn.
 \bninth\b	9
@@ -107,23 +107,23 @@
 \bgrdn\b	gdn
 \bhght\b	hts
 \bhgts\b	hts
-\bj\s+\\&k\b	j&k
-\bjct\\.\b	jn.
+\bj\s+\&k\b	j&k
+\bjct\.\b	jn.
 \bjnct\b	jn.
 \bpeth\b	pet
-\brnd\\.\b	cir.
+\brnd\.\b	cir.
 \broad\b	rd
-\bstr\\.\b	st
+\bstr\.\b	st
 \buniv\b	uni
 \bwest\b	w
-\bx\\-rd\b	xrd
+\bx\-rd\b	xrd
 \bxrds\b	xrd
 \bcha\b	ch
 \bctr\b	cen
 \bmum\b	bom
-\bno\\.\b	#
+\bno\.\b	#
 \bnum\b	#
 \brte\b	rt
-\bst\\.\b	st
+\bst\.\b	st
 \bstr\b	st
 \bno\b	#

components/autofill/core/browser/address_rewrite_rules/LU.txt

-\berpeldange\s+\\-\s+lez\s+\\-\s+bous\b	erpeldange
+\berpeldange\s+\-\s+lez\s+\-\s+bous\b	erpeldange
 \bhostert\s+niederanven\b	hostert
 \bgoebelsmuehle\b	goebelsmuhle
 \bbuederscheid\b	buderscheid
 \bschwebsingen\b	schwebsange
 \brammeldange\b	rameldange
 \bcul\s+de\s+sac\b	cds
-\bcul\\-de\\-sac\b	cds
+\bcul\-de\-sac\b	cds
 \bgeyershaff\b	geyershof
 \blexembourg\b	lu
 \bluxembourg\b	lu
-\brond\\-point\b	rdpt
+\brond\-point\b	rdpt
 \bboulevard\b	boul
 \bcarrefour\b	carref
 \bcroissant\b	crois

components/autofill/core/browser/address_rewrite_rules/NL.txt

 \bwesterhaar\s+vriezenveensewijk\b	westerhaar-vriezenv wijk
 \bnoord\s+brabant\b	nb
 \bnoord\s+holland\b	nh
-\bnoord\\-brabant\b	nb
-\bnoord\\-holland\b	nh
+\bnoord\-brabant\b	nb
+\bnoord\-holland\b	nh
 \balphen\s+chaam\b	ac
 \bburgemeester\b	burg
 \bnoordbrabant\b	nb
 \bs\s+gravenhage\b	sgravenhage
 \bzuid\s+holland\b	zh
-\bzuid\\-holland\b	zh
+\bzuid\-holland\b	zh
 \bmonseigneur\b	mgr
 \bnetherlands\b	nl
 \bnordholland\b	nh
@@ -43,18 +43,18 @@
 \bvierde\b	4
 \bvijfde\b	5
 \bderde\b	3
-\bnl\\-dr\b	dr
-\bnl\\-fl\b	fl
-\bnl\\-fr\b	fr
-\bnl\\-ge\b	ge
-\bnl\\-gr\b	gn
-\bnl\\-li\b	l
-\bnl\\-nb\b	nb
-\bnl\\-nh\b	nh
-\bnl\\-ov\b	ov
-\bnl\\-ut\b	u
-\bnl\\-ze\b	z
-\bnl\\-zh\b	zh
+\bnl\-dr\b	dr
+\bnl\-fl\b	fl
+\bnl\-fr\b	fr
+\bnl\-ge\b	ge
+\bnl\-gr\b	gn
+\bnl\-li\b	l
+\bnl\-nb\b	nb
+\bnl\-nh\b	nh
+\bnl\-ov\b	ov
+\bnl\-ut\b	u
+\bnl\-ze\b	z
+\bnl\-zh\b	zh
 \bzesde\b	6
 \bsint\b	st
 \ba\s+d\b	ad
@@ -71,4 +71,4 @@
 \but\b	u
 \bze\b	z
 \bzl\b	z
-\b\\#\b	
+\b\#\b	

components/autofill/core/browser/address_rewrite_rules/NZ.txt

@@ -21,17 +21,17 @@
 \bsouth\b	s
 \beast\b	e
 \blane\b	ln
-\bn\\.z\\.\b	nz
+\bn\.z\.\b	nz
 \broad\b	rd
 \bwest\b	w
-\bmt\\.\b	mt
-\bn\\.z\b	nz
+\bmt\.\b	mt
+\bn\.z\b	nz
 \bnth\b	n
-\bpt\\.\b	pt
-\bst\\.\b	st
+\bpt\.\b	pt
+\bst\.\b	st
 \bsth\b	s
-\be\\.\b	e
-\bn\\.\b	n
-\bs\\.\b	s
-\bw\\.\b	w
+\be\.\b	e
+\bn\.\b	n
+\bs\.\b	s
+\bw\.\b	w
 \bd\b	

components/autofill/core/browser/address_rewrite_rules/PR.txt

@@ -12,19 +12,19 @@
 \bplaza\b	plz
 \bsaint\b	st
 \bsouth\b	s
-\bave\\.\b	av
+\bave\.\b	av
 \beast\b	e
 \blane\b	ln
-\bp\\.r\\.\b	pr
+\bp\.r\.\b	pr
 \broad\b	rd
 \bwest\b	w
 \bave\b	av
 \bcam\b	cm
 \bnth\b	n
-\bp\\.r\b	pr
-\bst\\.\b	st
+\bp\.r\b	pr
+\bst\.\b	st
 \bsth\b	s
-\be\\.\b	e
-\bn\\.\b	n
-\bs\\.\b	s
-\bw\\.\b	w
+\be\.\b	e
+\bn\.\b	n
+\bs\.\b	s
+\bw\.\b	w

components/autofill/core/browser/address_rewrite_rules/RU.txt

@@ -12,7 +12,7 @@
 \bроссия\b	ru
 \bбульв\b	б-р
 \bлиния\b	лин
-\bпр\\-кт\b	пр
+\bпр\-кт\b	пр
 \bпросп\b	пр
 \bтупик\b	туп
 \bулица\b	ул

components/autofill/core/browser/address_rewrite_rules/US.txt

@@ -696,4 +696,4 @@
 \btn\b	
 \btw\b	tp
 \bvy\b	vl
-\b\\#\b	
+\b\#\b	

components/autofill/core/browser/address_rewrite_rules/VN.txt

@@ -11,9 +11,9 @@
 \bhuyen\b	h.
 \bhcmc\b	hcm
 \bquan\b	q.
-\bph\\.\b	p
-\btp\\.\b	tp
-\btt\\.\b	tt
-\btx\\.\b	tx
-\bp\\.\b	p
+\bph\.\b	p
+\btp\.\b	tp
+\btt\.\b	tt
+\btx\.\b	tx
+\bp\.\b	p
 \bxa\b	x.

components/autofill/core/browser/address_rewriter_unittest.cc

@@ -80,6 +80,8 @@ TEST(AddressRewriterTest, CA) {
             ca.Rewrite(UTF8ToUTF16("pei")));
   EXPECT_EQ(ca.Rewrite(UTF8ToUTF16("prince edward island")),
             ca.Rewrite(UTF8ToUTF16("ile du prince edouard")));
+  EXPECT_EQ(ca.Rewrite(UTF8ToUTF16("cul-de-sac")),
+            ca.Rewrite(UTF8ToUTF16("cul de sac")));
   EXPECT_EQ(ca.Rewrite(UTF8ToUTF16("st")), ca.Rewrite(UTF8ToUTF16("street")));
   EXPECT_EQ(ca.Rewrite(UTF8ToUTF16("sainte")),
             ca.Rewrite(UTF8ToUTF16("saint")));
@@ -98,6 +100,8 @@ TEST(AddressRewriterTest, CL) {
   EXPECT_EQ(
       cl.Rewrite(UTF8ToUTF16("aisen del general carlos ibanez del campo")),
       cl.Rewrite(UTF8ToUTF16("xi")));
+  EXPECT_EQ(cl.Rewrite(UTF8ToUTF16("libertador general bernardo o'higgins")),
+            cl.Rewrite(UTF8ToUTF16("vi")));
   EXPECT_EQ(cl.Rewrite(UTF8ToUTF16("metropolitana de santiago de chile")),
             cl.Rewrite(UTF8ToUTF16("metropolitana de santiago")));
 }
@@ -170,6 +174,15 @@ TEST(AddressRewriterTest, IN) {
   AddressRewriter in = AddressRewriter::ForCountryCode(UTF8ToUTF16("in"));
   EXPECT_EQ(in.Rewrite(UTF8ToUTF16("thiruvananthapuram")),
             in.Rewrite(UTF8ToUTF16("tiruvananthapuram")));
+  EXPECT_EQ(in.Rewrite(UTF8ToUTF16("jammu & kashmir")),
+            in.Rewrite(UTF8ToUTF16("j&k")));
+  EXPECT_EQ(in.Rewrite(UTF8ToUTF16("cross-road")),
+            in.Rewrite(UTF8ToUTF16("xrd")));
+  EXPECT_EQ(in.Rewrite(UTF8ToUTF16("j & k")), in.Rewrite(UTF8ToUTF16("j&k")));
+  EXPECT_EQ(in.Rewrite(UTF8ToUTF16("i.n.d.i.a")),
+            in.Rewrite(UTF8ToUTF16("india")));
+  EXPECT_NE(in.Rewrite(UTF8ToUTF16("i\\_n\\_d\\_i\\_a")),
+            in.Rewrite(UTF8ToUTF16("india")));
 }
 
 TEST(AddressRewriterTest, IT) {