BASELINE: Update Chromium to 47.0.2526.71

Also adds a few missing spellcheck sources.

Change-Id: I300864710316ff3cd3ad456dd7a3d048b45f57d5
Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>

3 files changed, 110 insertions, 13 deletions

diff --git a/chromium/net/base/registry_controlled_domains/effective_tld_names.dat b/chromium/net/base/registry_controlled_domains/effective_tld_names.dat
index 165cc09520b..ce9ad58c7fe 100644
--- a/chromium/net/base/registry_controlled_domains/effective_tld_names.dat
+++ b/chromium/net/base/registry_controlled_domains/effective_tld_names.dat
@@ -1134,8 +1134,16 @@ web.id
 ie
 gov.ie
 
-// il : http://en.wikipedia.org/wiki/.il
-*.il
+// il : http://www.isoc.org.il/domains/
+il
+ac.il
+co.il
+gov.il
+idf.il
+k12.il
+muni.il
+net.il
+org.il
 
 // im : https://www.nic.im/
 // Submitted by registry <info@nic.im> 2013-11-15
@@ -6922,7 +6930,7 @@ web.za
 *.zw
 
 
-// List of new gTLDs imported from https://newgtlds.icann.org/newgtlds.csv on 2015-09-25T01:37:01Z
+// List of new gTLDs imported from https://newgtlds.icann.org/newgtlds.csv on 2015-11-12T22:43:48Z
 
 // aaa : 2015-02-26 American Automobile Association, Inc.
 aaa
@@ -7191,6 +7199,9 @@ barefoot
 // bargains : 2013-11-14 Half Hallow, LLC
 bargains
 
+// baseball : 2015-10-29 MLB Advanced Media DH, LLC
+baseball
+
 // basketball : 2015-08-20 Fédération Internationale de Basketball (FIBA)
 basketball
 
@@ -7449,6 +7460,9 @@ casino
 // catering : 2013-12-05 New Falls. LLC
 catering
 
+// catholic : 2015-10-21 Pontificium Consilium de Comunicationibus Socialibus (PCCS) (Pontifical Council for Social Communication)
+catholic
+
 // cba : 2014-06-26 COMMONWEALTH BANK OF AUSTRALIA
 cba
 
@@ -7548,6 +7562,9 @@ click
 // clinic : 2014-03-20 Goose Park, LLC
 clinic
 
+// clinique : 2015-10-01 The Estée Lauder Companies Inc.
+clinique
+
 // clothing : 2013-08-27 Steel Lake, LLC
 clothing
 
@@ -7587,6 +7604,9 @@ community
 // company : 2013-11-07 Silver Avenue, LLC
 company
 
+// compare : 2015-10-08 iSelect Ltd
+compare
+
 // computer : 2013-10-24 Pine Mill, LLC
 computer
 
@@ -7761,6 +7781,9 @@ discover
 // dish : 2015-07-30 Dish DBS Corporation
 dish
 
+// diy : 2015-11-05 Lifestyle Domain Holdings, Inc.
+diy
+
 // dnp : 2013-12-13 Dai Nippon Printing Co., Ltd.
 dnp
 
@@ -8583,6 +8606,9 @@ ladbrokes
 // lamborghini : 2015-06-04 Automobili Lamborghini S.p.A.
 lamborghini
 
+// lamer : 2015-10-01 The Estée Lauder Companies Inc.
+lamer
+
 // lancaster : 2015-02-12 LANCASTER
 lancaster
 
@@ -9024,6 +9050,9 @@ ninja
 // nissan : 2014-03-27 NISSAN MOTOR CO., LTD.
 nissan
 
+// nissay : 2015-10-29 Nippon Life Insurance Company
+nissay
+
 // nokia : 2015-01-08 Nokia Corporation
 nokia
 
@@ -9117,6 +9146,9 @@ organic
 // orientexpress : 2015-02-05 Belmond Ltd.
 orientexpress
 
+// origins : 2015-10-01 The Estée Lauder Companies Inc.
+origins
+
 // osaka : 2014-09-04 Interlink Co., Ltd.
 osaka
 
@@ -9297,6 +9329,9 @@ prudential
 // pub : 2013-12-12 United TLD Holdco Ltd.
 pub
 
+// pwc : 2015-10-29 PricewaterhouseCoopers LLP
+pwc
+
 // qpon : 2013-11-14 dotCOOL, Inc.
 qpon
 
@@ -9543,6 +9578,9 @@ security
 // seek : 2014-12-04 Seek Limited
 seek
 
+// select : 2015-10-08 iSelect Ltd
+select
+
 // sener : 2014-10-24 Sener Ingeniería y Sistemas, S.A.
 sener
 
@@ -9693,7 +9731,7 @@ staples
 // star : 2015-01-08 Star India Private Limited
 star
 
-// starhub : 2015-02-05 StarHub Limited
+// starhub : 2015-02-05 StarHub Ltd
 starhub
 
 // statebank : 2015-03-12 STATE BANK OF INDIA
@@ -9957,6 +9995,9 @@ ubs
 // uconnect : 2015-07-30 FCA US LLC.
 uconnect
 
+// unicom : 2015-10-15 China United Network Communications Corporation Limited
+unicom
+
 // university : 2014-03-06 Little Station, LLC
 university
 
@@ -10152,6 +10193,9 @@ works
 // world : 2014-06-12 Bitter Fields, LLC
 world
 
+// wow : 2015-10-08 Amazon EU S.à r.l.
+wow
+
 // wtc : 2013-12-19 World Trade Centers Association, Inc.
 wtc
 
@@ -10230,6 +10274,9 @@ xin
 // xn--80adxhks : 2013-12-19 Foundation for Assistance for Internet Technologies and Infrastructure Development (FAITID)
 москва
 
+// xn--80aqecdr1a : 2015-10-21 Pontificium Consilium de Comunicationibus Socialibus (PCCS) (Pontifical Council for Social Communication)
+католик
+
 // xn--80asehdb : 2013-07-14 CORE Association
 онлайн
 
@@ -10314,6 +10361,9 @@ xin
 // xn--gckr3f0f : 2015-02-26 Amazon EU S.à r.l.
 クラウド
 
+// xn--gk3at1e : 2015-10-08 Amazon EU S.à r.l.
+通販
+
 // xn--hxt814e : 2014-05-15 Zodiac Libra Limited
 网店
 
@@ -10362,6 +10412,9 @@ xin
 // xn--mgbca7dzdo : 2015-07-30 Abu Dhabi Systems and Information Centre
 ابوظبي
 
+// xn--mgbi4ecexp : 2015-10-21 Pontificium Consilium de Comunicationibus Socialibus (PCCS) (Pontifical Council for Social Communication)
+كاثوليك
+
 // xn--mgbt3dhd : 2014-09-04 Asia Green IT System Bilgisayar San. ve Tic. Ltd. Sti.
 همراه
 
@@ -10416,6 +10469,9 @@ xin
 // xn--tckwe : 2015-01-15 VeriSign Sarl
 コム
 
+// xn--tiq49xqyj : 2015-10-21 Pontificium Consilium de Comunicationibus Socialibus (PCCS) (Pontifical Council for Social Communication)
+天主教
+
 // xn--unup4y : 2013-07-14 Spring Fields, LLC
 游戏
 
@@ -11133,6 +11189,10 @@ bmoattachments.org
 // Submitted by Trung Tran <Trung.Tran@neustar.biz> 2015-04-23
 4u.com
 
+// ngrok : https://ngrok.com/
+// Submitted by Alan Shreve <alan@ngrok.com> 2015-11-10
+ngrok.io
+
 // NFSN, Inc. : https://www.NearlyFreeSpeech.NET/
 // Submitted by Jeff Wheelhouse <support@nearlyfreespeech.net> 2014-02-02
 nfshost.com
diff --git a/chromium/net/base/registry_controlled_domains/effective_tld_names.gperf b/chromium/net/base/registry_controlled_domains/effective_tld_names.gperf
index 21b685b1212..94ba5c0ba75 100644
--- a/chromium/net/base/registry_controlled_domains/effective_tld_names.gperf
+++ b/chromium/net/base/registry_controlled_domains/effective_tld_names.gperf
@@ -59,6 +59,7 @@ ac.cr, 0
 ac.cy, 0
 ac.gn, 0
 ac.id, 0
+ac.il, 0
 ac.im, 0
 ac.in, 0
 ac.ir, 0
@@ -511,6 +512,7 @@ barrel-of-knowledge.info, 4
 barrell-of-knowledge.info, 4
 barum.no, 0
 bas.it, 0
+baseball, 0
 baseball.museum, 0
 basel.museum, 0
 bashkiria.ru, 0
@@ -887,6 +889,7 @@ catania.it, 0
 catanzaro.it, 0
 catering, 0
 catering.aero, 0
+catholic, 0
 cb.it, 0
 cba, 0
 cbg.ru, 0
@@ -1078,6 +1081,7 @@ claims, 0
 cleaning, 0
 click, 0
 clinic, 0
+clinique, 0
 clinton.museum, 0
 clock.museum, 0
 clothing, 0
@@ -1120,6 +1124,7 @@ co.gl, 0
 co.gy, 0
 co.hu, 0
 co.id, 0
+co.il, 0
 co.im, 0
 co.in, 0
 co.ir, 0
@@ -1313,6 +1318,7 @@ community, 0
 community.museum, 0
 como.it, 0
 company, 0
+compare, 0
 compute-1.amazonaws.com, 4
 compute.amazonaws.cn, 4
 compute.amazonaws.com, 4
@@ -1481,6 +1487,7 @@ discovery.museum, 0
 dish, 0
 divtasvuodna.no, 0
 divttasvuotna.no, 0
+diy, 0
 dj, 0
 dk, 0
 dk.eu.org, 4
@@ -2348,6 +2355,7 @@ gov.gn, 0
 gov.gr, 0
 gov.hk, 0
 gov.ie, 0
+gov.il, 0
 gov.in, 0
 gov.iq, 0
 gov.ir, 0
@@ -2827,6 +2835,7 @@ id.lv, 0
 id.ly, 0
 id.us, 0
 ide.kyoto.jp, 0
+idf.il, 0
 idrett.no, 0
 idv.hk, 0
 idv.tw, 0
@@ -2859,7 +2868,7 @@ iki.fi, 4
 iki.nagasaki.jp, 0
 ikoma.nara.jp, 0
 ikusaka.nagano.jp, 0
-il, 2
+il, 0
 il.eu.org, 4
 il.us, 0
 ilawa.pl, 0
@@ -3239,6 +3248,7 @@ k12.ga.us, 0
 k12.gu.us, 0
 k12.ia.us, 0
 k12.id.us, 0
+k12.il, 0
 k12.il.us, 0
 k12.in.us, 0
 k12.ks.us, 0
@@ -3721,6 +3731,7 @@ lahppi.no, 0
 lajolla.museum, 0
 lakas.hu, 0
 lamborghini, 0
+lamer, 0
 lanbib.se, 0
 lancashire.museum, 0
 lancaster, 0
@@ -4409,6 +4420,7 @@ mulhouse.museum, 0
 multichoice, 0
 munakata.fukuoka.jp, 0
 muncie.museum, 0
+muni.il, 0
 muosat.no, 0
 mup.gov.pl, 0
 murakami.niigata.jp, 0
@@ -4658,6 +4670,7 @@ net.hk, 0
 net.hn, 0
 net.ht, 0
 net.id, 0
+net.il, 0
 net.im, 0
 net.in, 0
 net.iq, 0
@@ -4765,6 +4778,7 @@ ngo, 0
 ngo.lk, 0
 ngo.ph, 0
 ngo.za, 0
+ngrok.io, 4
 nh.us, 0
 nhk, 0
 nhs.uk, 0
@@ -4816,6 +4830,7 @@ nishiokoppe.hokkaido.jp, 0
 nishitosa.kochi.jp, 0
 nishiwaki.hyogo.jp, 0
 nissan, 0
+nissay, 0
 nissedal.no, 0
 nisshin.aichi.jp, 0
 nittedal.no, 0
@@ -5144,6 +5159,7 @@ org.hk, 0
 org.hn, 0
 org.ht, 0
 org.hu, 0
+org.il, 0
 org.im, 0
 org.in, 0
 org.iq, 0
@@ -5235,6 +5251,7 @@ org.ws, 0
 org.za, 0
 organic, 0
 orientexpress, 0
+origins, 0
 oristano.it, 0
 orkanger.no, 0
 orkdal.no, 0
@@ -5556,6 +5573,7 @@ pv.it, 0
 pvt.ge, 0
 pvt.k12.ma.us, 0
 pw, 0
+pwc, 0
 py, 0
 pyatigorsk.ru, 0
 pz.it, 0
@@ -5959,6 +5977,7 @@ sekigahara.gifu.jp, 0
 sekikawa.niigata.jp, 0
 sel.no, 0
 selbu.no, 0
+select, 0
 selfip.biz, 4
 selfip.com, 4
 selfip.info, 4
@@ -6874,6 +6893,7 @@ umig.gov.pl, 0
 unazuki.toyama.jp, 0
 unbi.ba, 0
 undersea.museum, 0
+unicom, 0
 union.aero, 0
 univ.sn, 0
 university, 0
@@ -7194,6 +7214,7 @@ works.aero, 0
 workshop.museum, 0
 world, 0
 worse-than.tv, 4
+wow, 0
 writesthisblog.com, 4
 wroc.pl, 4
 wroclaw.pl, 0
@@ -7257,6 +7278,7 @@ xn--6qq986b3xl, 0
 xn--7t0a264c.jp, 0
 xn--80adxhks, 0
 xn--80ao21a, 0
+xn--80aqecdr1a, 0
 xn--80asehdb, 0
 xn--80aswg, 0
 xn--80au.xn--90a3ac, 0
@@ -7352,6 +7374,7 @@ xn--ggaviika-8ya47h.no, 0
 xn--gildeskl-g0a.no, 0
 xn--givuotna-8ya.no, 0
 xn--gjvik-wua.no, 0
+xn--gk3at1e, 0
 xn--gls-elac.no, 0
 xn--gmq050i.hk, 0
 xn--gmqw5a.hk, 0
@@ -7449,6 +7472,7 @@ xn--mgbc0a9azcg, 0
 xn--mgbca7dzdo, 0
 xn--mgberp4a5d4a87g, 0
 xn--mgberp4a5d4ar, 0
+xn--mgbi4ecexp, 0
 xn--mgbpl2fh, 0
 xn--mgbqly7c0a67fbc, 0
 xn--mgbqly7cvafr, 0
@@ -7565,6 +7589,7 @@ xn--stjrdalshalsen-sqb.no, 0
 xn--stre-toten-zcb.no, 0
 xn--t60b56a, 0
 xn--tckwe, 0
+xn--tiq49xqyj, 0
 xn--tjme-hra.no, 0
 xn--tn0ag.hk, 0
 xn--tnsberg-q1a.no, 0
diff --git a/chromium/net/quic/quic_stream_factory.cc b/chromium/net/quic/quic_stream_factory.cc
index 62fd664968e..cf32df9ddb3 100644
--- a/chromium/net/quic/quic_stream_factory.cc
+++ b/chromium/net/quic/quic_stream_factory.cc
@@ -711,13 +711,16 @@ int QuicStreamFactory::Create(const HostPortPair& host_port_pair,
                               const BoundNetLog& net_log,
                               QuicStreamRequest* request) {
   QuicServerId server_id(host_port_pair, is_https, privacy_mode);
-  SessionMap::iterator it = active_sessions_.find(server_id);
-  if (it != active_sessions_.end()) {
-    QuicChromiumClientSession* session = it->second;
-    if (!session->CanPool(origin_host.as_string(), privacy_mode))
-      return ERR_ALTERNATIVE_CERT_NOT_VALID_FOR_ORIGIN;
-    request->set_stream(CreateFromSession(session));
-    return OK;
+  // TODO(rtenneti): crbug.com/498823 - delete active_sessions_.empty() checks.
+  if (!active_sessions_.empty()) {
+    SessionMap::iterator it = active_sessions_.find(server_id);
+    if (it != active_sessions_.end()) {
+      QuicChromiumClientSession* session = it->second;
+      if (!session->CanPool(origin_host.as_string(), privacy_mode))
+        return ERR_ALTERNATIVE_CERT_NOT_VALID_FOR_ORIGIN;
+      request->set_stream(CreateFromSession(session));
+      return OK;
+    }
   }
 
   if (HasActiveJob(server_id)) {
@@ -764,8 +767,14 @@ int QuicStreamFactory::Create(const HostPortPair& host_port_pair,
     return rv;
   }
   if (rv == OK) {
-    it = active_sessions_.find(server_id);
+    // TODO(rtenneti): crbug.com/498823 - revert active_sessions_.empty()
+    // related changes.
+    if (active_sessions_.empty())
+      return ERR_QUIC_PROTOCOL_ERROR;
+    SessionMap::iterator it = active_sessions_.find(server_id);
     DCHECK(it != active_sessions_.end());
+    if (it == active_sessions_.end())
+      return ERR_QUIC_PROTOCOL_ERROR;
     QuicChromiumClientSession* session = it->second;
     if (!session->CanPool(origin_host.as_string(), privacy_mode))
       return ERR_ALTERNATIVE_CERT_NOT_VALID_FOR_ORIGIN;
@@ -1165,6 +1174,9 @@ void QuicStreamFactory::OnCACertChanged(const X509Certificate* cert) {
 
 bool QuicStreamFactory::HasActiveSession(
     const QuicServerId& server_id) const {
+  // TODO(rtenneti): crbug.com/498823 - delete active_sessions_.empty() check.
+  if (active_sessions_.empty())
+    return false;
   return ContainsKey(active_sessions_, server_id);
 }