Home Explore Help
Register Sign In
RISCI_ATOM
/
ungoogled-chromium
mirror of https://github.com/Eloston/ungoogled-chromium.git
1
0
Fork 0
Files Issues 1 Wiki
Tree: 588c197d3c
Branches Tags
ungoogled-chrom...
/
patches
/
core
/
ungoogled-chromium
/
disable-domain-reliability.patch

disable-domain-reliability.patch 27 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687 
  1. # Disable domain reliability component
    2. 

  2. 

  3. --- a/components/domain_reliability/BUILD.gn
    4. 

  4. +++ b/components/domain_reliability/BUILD.gn
    5. 

  5. @@ -9,26 +9,6 @@ action("bake_in_configs") {
    6. 

  6.    script = "bake_in_configs.py"
    7. 

  7.  
    8. 

  8.    inputs = [
    9. 

  9. -    "baked_in_configs/c_android_clients_google_com.json",
    10. 

  10. -    "baked_in_configs/c_bigcache_googleapis_com.json",
    11. 

  11. -    "baked_in_configs/c_doc-0-0-sj_sj_googleusercontent_com.json",
    12. 

  12. -    "baked_in_configs/c_docs_google_com.json",
    13. 

  13. -    "baked_in_configs/c_drive_google_com.json",
    14. 

  14. -    "baked_in_configs/c_googlesyndication_com.json",
    15. 

  15. -    "baked_in_configs/c_pack_google_com.json",
    16. 

  16. -    "baked_in_configs/c_play_google_com.json",
    17. 

  17. -    "baked_in_configs/c_youtube_com.json",
    18. 

  18. -    "baked_in_configs/clients2_google_com.json",
    19. 

  19. -    "baked_in_configs/docs_google_com.json",
    20. 

  20. -    "baked_in_configs/gcp_gvt2_com.json",
    21. 

  21. -    "baked_in_configs/gcp_gvt6_com.json",
    22. 

  22. -    "baked_in_configs/google-analytics_com.json",
    23. 

  23. -    "baked_in_configs/googlevideo_com.json",
    24. 

  24. -    "baked_in_configs/gvt1_com.json",
    25. 

  25. -    "baked_in_configs/gvt2_com.json",
    26. 

  26. -    "baked_in_configs/gvt6_com.json",
    27. 

  27. -    "baked_in_configs/ssl_gstatic_com.json",
    28. 

  28. -    "baked_in_configs/www_google_com.json",
    29. 

  29.    ]
    30. 

  30.  
    31. 

  31.    output_file = "$target_gen_dir/baked_in_configs.cc"
    32. 

  32. @@ -36,13 +16,21 @@ action("bake_in_configs") {
    33. 

  33.  
    34. 

  34.    # The JSON file list is too long for the command line on Windows, so put
    35. 

  35.    # them in a response file.
    36. 

  36. -  response_file_contents = rebase_path(inputs, root_build_dir)
    37. 

  37. -  args = [
    38. 

  38. -    "--file-list",
    39. 

  39. -    "{{response_file_name}}",
    40. 

  40. -    "--output",
    41. 

  41. -    rebase_path(output_file, root_build_dir),
    42. 

  42. -  ]
    43. 

  43. +  if (is_win) {
    44. 

  44. +      args = [
    45. 

  45. +        "--file-list",
    46. 

  46. +        "nul",
    47. 

  47. +        "--output",
    48. 

  48. +        rebase_path(output_file, root_build_dir),
    49. 

  49. +      ]
    50. 

  50. +  } else {
    51. 

  51. +        args = [
    52. 

  52. +        "--file-list",
    53. 

  53. +        "/dev/null",
    54. 

  54. +        "--output",
    55. 

  55. +        rebase_path(output_file, root_build_dir),
    56. 

  56. +      ]
    57. 

  57. +  }
    58. 

  58.  }
    59. 

  59.  
    60. 

  60.  jumbo_component("domain_reliability") {
    61. 

  61. --- a/components/domain_reliability/bake_in_configs.py
    62. 

  62. +++ b/components/domain_reliability/bake_in_configs.py
    63. 

  63. @@ -490,7 +490,7 @@ def origin_is_whitelisted(origin):
    64. 

  64.      domain = origin[8:-1]
    65. 

  65.    else:
    66. 

  66.      return False
    67. 

  67. -  return any(domain == e or domain.endswith('.' + e)  for e in DOMAIN_WHITELIST)
    68. 

  68. +  return False
    69. 

  69.  
    70. 

  70.  
    71. 

  71.  def quote_and_wrap_text(text, width=79, prefix='  "', suffix='"'):
    72. 

  72. --- a/components/domain_reliability/google_configs.cc
    73. 

  73. +++ b/components/domain_reliability/google_configs.cc
    74. 

  74. @@ -10,564 +10,6 @@
    75. 

  75.  
    76. 

  76.  namespace domain_reliability {
    77. 

  77.  
    78. 

  78. -namespace {
    79. 

  79. -
    80. 

  80. -struct GoogleConfigParams {
    81. 

  81. -  const char* hostname;
    82. 

  82. -  bool include_subdomains;
    83. 

  83. -
    84. 

  84. -  // If true, prepend a collector URL within https://|hostname|/.
    85. 

  85. -  bool include_origin_specific_collector;
    86. 

  86. -
    87. 

  87. -  // If true, also add a config for www.|hostname|.
    88. 

  88. -  //
    89. 

  89. -  // |include_subdomains| will be false in the extra config, but
    90. 

  90. -  // |include_origin_specific_collector| will be respected, and will use the
    91. 

  91. -  // www subdomain as the origin for the collector so it matches the config.
    92. 

  92. -  bool duplicate_for_www;
    93. 

  93. -};
    94. 

  94. -
    95. 

  95. -const GoogleConfigParams kGoogleConfigs[] = {
    96. 

  96. -    // Origins with subdomains and same-origin collectors. Currently, all
    97. 

  97. -    // origins with same-origin collectors also run collectors on their www
    98. 

  98. -    // subdomain. (e.g., both foo.com and www.foo.com.)
    99. 

  99. -    {"google.ac", true, true, true},
    100. 

  100. -    {"google.ad", true, true, true},
    101. 

  101. -    {"google.ae", true, true, true},
    102. 

  102. -    {"google.af", true, true, true},
    103. 

  103. -    {"google.ag", true, true, true},
    104. 

  104. -    {"google.al", true, true, true},
    105. 

  105. -    {"google.am", true, true, true},
    106. 

  106. -    {"google.as", true, true, true},
    107. 

  107. -    {"google.at", true, true, true},
    108. 

  108. -    {"google.az", true, true, true},
    109. 

  109. -    {"google.ba", true, true, true},
    110. 

  110. -    {"google.be", true, true, true},
    111. 

  111. -    {"google.bf", true, true, true},
    112. 

  112. -    {"google.bg", true, true, true},
    113. 

  113. -    {"google.bi", true, true, true},
    114. 

  114. -    {"google.bj", true, true, true},
    115. 

  115. -    {"google.bs", true, true, true},
    116. 

  116. -    {"google.bt", true, true, true},
    117. 

  117. -    {"google.by", true, true, true},
    118. 

  118. -    {"google.ca", true, true, true},
    119. 

  119. -    {"google.cc", true, true, true},
    120. 

  120. -    {"google.cd", true, true, true},
    121. 

  121. -    {"google.cf", true, true, true},
    122. 

  122. -    {"google.cg", true, true, true},
    123. 

  123. -    {"google.ch", true, true, true},
    124. 

  124. -    {"google.ci", true, true, true},
    125. 

  125. -    {"google.cl", true, true, true},
    126. 

  126. -    {"google.cm", true, true, true},
    127. 

  127. -    {"google.cn", true, true, true},
    128. 

  128. -    {"google.co.ao", true, true, true},
    129. 

  129. -    {"google.co.bw", true, true, true},
    130. 

  130. -    {"google.co.ck", true, true, true},
    131. 

  131. -    {"google.co.cr", true, true, true},
    132. 

  132. -    {"google.co.hu", true, true, true},
    133. 

  133. -    {"google.co.id", true, true, true},
    134. 

  134. -    {"google.co.il", true, true, true},
    135. 

  135. -    {"google.co.im", true, true, true},
    136. 

  136. -    {"google.co.in", true, true, true},
    137. 

  137. -    {"google.co.je", true, true, true},
    138. 

  138. -    {"google.co.jp", true, true, true},
    139. 

  139. -    {"google.co.ke", true, true, true},
    140. 

  140. -    {"google.co.kr", true, true, true},
    141. 

  141. -    {"google.co.ls", true, true, true},
    142. 

  142. -    {"google.co.ma", true, true, true},
    143. 

  143. -    {"google.co.mz", true, true, true},
    144. 

  144. -    {"google.co.nz", true, true, true},
    145. 

  145. -    {"google.co.th", true, true, true},
    146. 

  146. -    {"google.co.tz", true, true, true},
    147. 

  147. -    {"google.co.ug", true, true, true},
    148. 

  148. -    {"google.co.uk", true, true, true},
    149. 

  149. -    {"google.co.uz", true, true, true},
    150. 

  150. -    {"google.co.ve", true, true, true},
    151. 

  151. -    {"google.co.vi", true, true, true},
    152. 

  152. -    {"google.co.za", true, true, true},
    153. 

  153. -    {"google.co.zm", true, true, true},
    154. 

  154. -    {"google.co.zw", true, true, true},
    155. 

  155. -    {"google.com.af", true, true, true},
    156. 

  156. -    {"google.com.ag", true, true, true},
    157. 

  157. -    {"google.com.ai", true, true, true},
    158. 

  158. -    {"google.com.ar", true, true, true},
    159. 

  159. -    {"google.com.au", true, true, true},
    160. 

  160. -    {"google.com.bd", true, true, true},
    161. 

  161. -    {"google.com.bh", true, true, true},
    162. 

  162. -    {"google.com.bn", true, true, true},
    163. 

  163. -    {"google.com.bo", true, true, true},
    164. 

  164. -    {"google.com.br", true, true, true},
    165. 

  165. -    {"google.com.by", true, true, true},
    166. 

  166. -    {"google.com.bz", true, true, true},
    167. 

  167. -    {"google.com.cn", true, true, true},
    168. 

  168. -    {"google.com.co", true, true, true},
    169. 

  169. -    {"google.com.cu", true, true, true},
    170. 

  170. -    {"google.com.cy", true, true, true},
    171. 

  171. -    {"google.com.do", true, true, true},
    172. 

  172. -    {"google.com.ec", true, true, true},
    173. 

  173. -    {"google.com.eg", true, true, true},
    174. 

  174. -    {"google.com.et", true, true, true},
    175. 

  175. -    {"google.com.fj", true, true, true},
    176. 

  176. -    {"google.com.ge", true, true, true},
    177. 

  177. -    {"google.com.gh", true, true, true},
    178. 

  178. -    {"google.com.gi", true, true, true},
    179. 

  179. -    {"google.com.gr", true, true, true},
    180. 

  180. -    {"google.com.gt", true, true, true},
    181. 

  181. -    {"google.com.hk", true, true, true},
    182. 

  182. -    {"google.com.iq", true, true, true},
    183. 

  183. -    {"google.com.jm", true, true, true},
    184. 

  184. -    {"google.com.jo", true, true, true},
    185. 

  185. -    {"google.com.kh", true, true, true},
    186. 

  186. -    {"google.com.kw", true, true, true},
    187. 

  187. -    {"google.com.lb", true, true, true},
    188. 

  188. -    {"google.com.ly", true, true, true},
    189. 

  189. -    {"google.com.mm", true, true, true},
    190. 

  190. -    {"google.com.mt", true, true, true},
    191. 

  191. -    {"google.com.mx", true, true, true},
    192. 

  192. -    {"google.com.my", true, true, true},
    193. 

  193. -    {"google.com.na", true, true, true},
    194. 

  194. -    {"google.com.nf", true, true, true},
    195. 

  195. -    {"google.com.ng", true, true, true},
    196. 

  196. -    {"google.com.ni", true, true, true},
    197. 

  197. -    {"google.com.np", true, true, true},
    198. 

  198. -    {"google.com.nr", true, true, true},
    199. 

  199. -    {"google.com.om", true, true, true},
    200. 

  200. -    {"google.com.pa", true, true, true},
    201. 

  201. -    {"google.com.pe", true, true, true},
    202. 

  202. -    {"google.com.pg", true, true, true},
    203. 

  203. -    {"google.com.ph", true, true, true},
    204. 

  204. -    {"google.com.pk", true, true, true},
    205. 

  205. -    {"google.com.pl", true, true, true},
    206. 

  206. -    {"google.com.pr", true, true, true},
    207. 

  207. -    {"google.com.py", true, true, true},
    208. 

  208. -    {"google.com.qa", true, true, true},
    209. 

  209. -    {"google.com.ru", true, true, true},
    210. 

  210. -    {"google.com.sa", true, true, true},
    211. 

  211. -    {"google.com.sb", true, true, true},
    212. 

  212. -    {"google.com.sg", true, true, true},
    213. 

  213. -    {"google.com.sl", true, true, true},
    214. 

  214. -    {"google.com.sv", true, true, true},
    215. 

  215. -    {"google.com.tj", true, true, true},
    216. 

  216. -    {"google.com.tn", true, true, true},
    217. 

  217. -    {"google.com.tr", true, true, true},
    218. 

  218. -    {"google.com.tw", true, true, true},
    219. 

  219. -    {"google.com.ua", true, true, true},
    220. 

  220. -    {"google.com.uy", true, true, true},
    221. 

  221. -    {"google.com.vc", true, true, true},
    222. 

  222. -    {"google.com.ve", true, true, true},
    223. 

  223. -    {"google.com.vn", true, true, true},
    224. 

  224. -    {"google.cv", true, true, true},
    225. 

  225. -    {"google.cz", true, true, true},
    226. 

  226. -    {"google.de", true, true, true},
    227. 

  227. -    {"google.dj", true, true, true},
    228. 

  228. -    {"google.dk", true, true, true},
    229. 

  229. -    {"google.dm", true, true, true},
    230. 

  230. -    {"google.dz", true, true, true},
    231. 

  231. -    {"google.ee", true, true, true},
    232. 

  232. -    {"google.es", true, true, true},
    233. 

  233. -    {"google.fi", true, true, true},
    234. 

  234. -    {"google.fm", true, true, true},
    235. 

  235. -    {"google.fr", true, true, true},
    236. 

  236. -    {"google.ga", true, true, true},
    237. 

  237. -    {"google.ge", true, true, true},
    238. 

  238. -    {"google.gg", true, true, true},
    239. 

  239. -    {"google.gl", true, true, true},
    240. 

  240. -    {"google.gm", true, true, true},
    241. 

  241. -    {"google.gp", true, true, true},
    242. 

  242. -    {"google.gr", true, true, true},
    243. 

  243. -    {"google.gy", true, true, true},
    244. 

  244. -    {"google.hk", true, true, true},
    245. 

  245. -    {"google.hn", true, true, true},
    246. 

  246. -    {"google.hr", true, true, true},
    247. 

  247. -    {"google.ht", true, true, true},
    248. 

  248. -    {"google.hu", true, true, true},
    249. 

  249. -    {"google.ie", true, true, true},
    250. 

  250. -    {"google.im", true, true, true},
    251. 

  251. -    {"google.iq", true, true, true},
    252. 

  252. -    {"google.ir", true, true, true},
    253. 

  253. -    {"google.is", true, true, true},
    254. 

  254. -    {"google.it", true, true, true},
    255. 

  255. -    {"google.it.ao", true, true, true},
    256. 

  256. -    {"google.je", true, true, true},
    257. 

  257. -    {"google.jo", true, true, true},
    258. 

  258. -    {"google.jp", true, true, true},
    259. 

  259. -    {"google.kg", true, true, true},
    260. 

  260. -    {"google.ki", true, true, true},
    261. 

  261. -    {"google.kz", true, true, true},
    262. 

  262. -    {"google.la", true, true, true},
    263. 

  263. -    {"google.li", true, true, true},
    264. 

  264. -    {"google.lk", true, true, true},
    265. 

  265. -    {"google.lt", true, true, true},
    266. 

  266. -    {"google.lu", true, true, true},
    267. 

  267. -    {"google.lv", true, true, true},
    268. 

  268. -    {"google.md", true, true, true},
    269. 

  269. -    {"google.me", true, true, true},
    270. 

  270. -    {"google.mg", true, true, true},
    271. 

  271. -    {"google.mk", true, true, true},
    272. 

  272. -    {"google.ml", true, true, true},
    273. 

  273. -    {"google.mn", true, true, true},
    274. 

  274. -    {"google.ms", true, true, true},
    275. 

  275. -    {"google.mu", true, true, true},
    276. 

  276. -    {"google.mv", true, true, true},
    277. 

  277. -    {"google.mw", true, true, true},
    278. 

  278. -    {"google.ne", true, true, true},
    279. 

  279. -    {"google.ne.jp", true, true, true},
    280. 

  280. -    {"google.ng", true, true, true},
    281. 

  281. -    {"google.nl", true, true, true},
    282. 

  282. -    {"google.no", true, true, true},
    283. 

  283. -    {"google.nr", true, true, true},
    284. 

  284. -    {"google.nu", true, true, true},
    285. 

  285. -    {"google.off.ai", true, true, true},
    286. 

  286. -    {"google.pk", true, true, true},
    287. 

  287. -    {"google.pl", true, true, true},
    288. 

  288. -    {"google.pn", true, true, true},
    289. 

  289. -    {"google.ps", true, true, true},
    290. 

  290. -    {"google.pt", true, true, true},
    291. 

  291. -    {"google.ro", true, true, true},
    292. 

  292. -    {"google.rs", true, true, true},
    293. 

  293. -    {"google.ru", true, true, true},
    294. 

  294. -    {"google.rw", true, true, true},
    295. 

  295. -    {"google.sc", true, true, true},
    296. 

  296. -    {"google.se", true, true, true},
    297. 

  297. -    {"google.sh", true, true, true},
    298. 

  298. -    {"google.si", true, true, true},
    299. 

  299. -    {"google.sk", true, true, true},
    300. 

  300. -    {"google.sm", true, true, true},
    301. 

  301. -    {"google.sn", true, true, true},
    302. 

  302. -    {"google.so", true, true, true},
    303. 

  303. -    {"google.sr", true, true, true},
    304. 

  304. -    {"google.st", true, true, true},
    305. 

  305. -    {"google.td", true, true, true},
    306. 

  306. -    {"google.tg", true, true, true},
    307. 

  307. -    {"google.tk", true, true, true},
    308. 

  308. -    {"google.tl", true, true, true},
    309. 

  309. -    {"google.tm", true, true, true},
    310. 

  310. -    {"google.tn", true, true, true},
    311. 

  311. -    {"google.to", true, true, true},
    312. 

  312. -    {"google.tt", true, true, true},
    313. 

  313. -    {"google.us", true, true, true},
    314. 

  314. -    {"google.uz", true, true, true},
    315. 

  315. -    {"google.vg", true, true, true},
    316. 

  316. -    {"google.vu", true, true, true},
    317. 

  317. -    {"google.ws", true, true, true},
    318. 

  318. -    {"l.google.com", true, true, true},
    319. 

  319. -
    320. 

  320. -    // google.com is a special case. We have a custom config for www.google.com,
    321. 

  321. -    // so set duplicate_for_www = false.
    322. 

  322. -    {"google.com", true, true, false},
    323. 

  323. -
    324. 

  324. -    // Origins with subdomains and without same-origin collectors.
    325. 

  325. -    {"2mdn.net", true, false, false},
    326. 

  326. -    {"adgoogle.net", true, false, false},
    327. 

  327. -    {"admeld.com", true, false, false},
    328. 

  328. -    {"admob.biz", true, false, false},
    329. 

  329. -    {"admob.co.in", true, false, false},
    330. 

  330. -    {"admob.co.kr", true, false, false},
    331. 

  331. -    {"admob.co.nz", true, false, false},
    332. 

  332. -    {"admob.co.uk", true, false, false},
    333. 

  333. -    {"admob.co.za", true, false, false},
    334. 

  334. -    {"admob.com", true, false, false},
    335. 

  335. -    {"admob.com.br", true, false, false},
    336. 

  336. -    {"admob.com.es", true, false, false},
    337. 

  337. -    {"admob.com.fr", true, false, false},
    338. 

  338. -    {"admob.com.mx", true, false, false},
    339. 

  339. -    {"admob.com.pt", true, false, false},
    340. 

  340. -    {"admob.de", true, false, false},
    341. 

  341. -    {"admob.dk", true, false, false},
    342. 

  342. -    {"admob.es", true, false, false},
    343. 

  343. -    {"admob.fi", true, false, false},
    344. 

  344. -    {"admob.fr", true, false, false},
    345. 

  345. -    {"admob.gr", true, false, false},
    346. 

  346. -    {"admob.hk", true, false, false},
    347. 

  347. -    {"admob.ie", true, false, false},
    348. 

  348. -    {"admob.in", true, false, false},
    349. 

  349. -    {"admob.it", true, false, false},
    350. 

  350. -    {"admob.jp", true, false, false},
    351. 

  351. -    {"admob.kr", true, false, false},
    352. 

  352. -    {"admob.mobi", true, false, false},
    353. 

  353. -    {"admob.no", true, false, false},
    354. 

  354. -    {"admob.ph", true, false, false},
    355. 

  355. -    {"admob.pt", true, false, false},
    356. 

  356. -    {"admob.sg", true, false, false},
    357. 

  357. -    {"admob.tw", true, false, false},
    358. 

  358. -    {"admob.us", true, false, false},
    359. 

  359. -    {"admob.vn", true, false, false},
    360. 

  360. -    {"adwhirl.com", true, false, false},
    361. 

  361. -    {"ampproject.com", true, false, false},
    362. 

  362. -    {"ampproject.net", true, false, false},
    363. 

  363. -    {"ampproject.org", true, false, false},
    364. 

  364. -    {"android.com", true, false, false},
    365. 

  365. -    {"anycast-edge.metric.gstatic.com", true, false, false},
    366. 

  366. -    {"anycast-stb.metric.gstatic.com", true, false, false},
    367. 

  367. -    {"anycast.metric.gstatic.com", true, false, false},
    368. 

  368. -    {"cdn.ampproject.org", true, false, false},
    369. 

  369. -    {"chromecast.com", true, false, false},
    370. 

  370. -    {"chromeexperiments.com", true, false, false},
    371. 

  371. -    {"chromestatus.com", true, false, false},
    372. 

  372. -    {"chromium.org", true, false, false},
    373. 

  373. -    {"clients6.google.com", true, false, false},
    374. 

  374. -    {"cloudendpointsapis.com", true, false, false},
    375. 

  375. -    {"dartmotif.com", true, false, false},
    376. 

  376. -    {"dartsearch.net", true, false, false},
    377. 

  377. -    {"doubleclick.com", true, false, false},
    378. 

  378. -    {"doubleclick.ne.jp", true, false, false},
    379. 

  379. -    {"doubleclick.net", true, false, false},
    380. 

  380. -    {"doubleclickusercontent.com", true, false, false},
    381. 

  381. -    {"fls.doubleclick.net", true, false, false},
    382. 

  382. -    {"g.co", true, false, false},
    383. 

  383. -    {"g.doubleclick.net", true, false, false},
    384. 

  384. -    {"ggpht.com", true, false, false},
    385. 

  385. -    {"gmodules.com", true, false, false},
    386. 

  386. -    {"goo.gl", true, false, false},
    387. 

  387. -    {"google-syndication.com", true, false, false},
    388. 

  388. -    {"google.cat", true, false, false},
    389. 

  389. -    {"google.info", true, false, false},
    390. 

  390. -    {"google.jobs", true, false, false},
    391. 

  391. -    {"google.net", true, false, false},
    392. 

  392. -    {"google.org", true, false, false},
    393. 

  393. -    {"google.stackdriver.com", true, false, false},
    394. 

  394. -    {"googleadapis.com", true, false, false},
    395. 

  395. -    {"googleadservices.com", true, false, false},
    396. 

  396. -    {"googleadsserving.cn", true, false, false},
    397. 

  397. -    {"googlealumni.com", true, false, false},
    398. 

  398. -    {"googleapis.cn", true, false, false},
    399. 

  399. -    {"googleapis.com", true, false, false},
    400. 

  400. -    {"googleapps.com", true, false, false},
    401. 

  401. -    {"googlecbs.com", true, false, false},
    402. 

  402. -    {"googlecode.com", true, false, false},
    403. 

  403. -    {"googlecommerce.com", true, false, false},
    404. 

  404. -    {"googledrive.com", true, false, false},
    405. 

  405. -    {"googleenterprise.com", true, false, false},
    406. 

  406. -    {"googlefiber.com", true, false, false},
    407. 

  407. -    {"googlefiber.net", true, false, false},
    408. 

  408. -    {"googlegoro.com", true, false, false},
    409. 

  409. -    {"googlehosted.com", true, false, false},
    410. 

  410. -    {"googlepayments.com", true, false, false},
    411. 

  411. -    {"googlesource.com", true, false, false},
    412. 

  412. -    {"googlesyndication.com", true, false, false},
    413. 

  413. -    {"googletagmanager.com", true, false, false},
    414. 

  414. -    {"googletagservices.com", true, false, false},
    415. 

  415. -    {"googleusercontent.com", true, false, false},
    416. 

  416. -    {"googlezip.net", true, false, false},
    417. 

  417. -    {"gstatic.cn", true, false, false},
    418. 

  418. -    {"gstatic.com", true, false, false},
    419. 

  419. -    {"gvt3.com", true, false, false},
    420. 

  420. -    {"gvt9.com", true, false, false},
    421. 

  421. -    {"picasa.com", true, false, false},
    422. 

  422. -    {"recaptcha.net", true, false, false},
    423. 

  423. -    {"stackdriver.com", true, false, false},
    424. 

  424. -    {"stbcast-stb.metric.gstatic.com", true, false, false},
    425. 

  425. -    {"stbcast.metric.gstatic.com", true, false, false},
    426. 

  426. -    {"stbcast2-stb.metric.gstatic.com", true, false, false},
    427. 

  427. -    {"stbcast2.metric.gstatic.com", true, false, false},
    428. 

  428. -    {"stbcast3-stb.metric.gstatic.com", true, false, false},
    429. 

  429. -    {"stbcast3.metric.gstatic.com", true, false, false},
    430. 

  430. -    {"stbcast4-stb.metric.gstatic.com", true, false, false},
    431. 

  431. -    {"stbcast4.metric.gstatic.com", true, false, false},
    432. 

  432. -    {"unicast-edge.metric.gstatic.com", true, false, false},
    433. 

  433. -    {"unicast-stb.metric.gstatic.com", true, false, false},
    434. 

  434. -    {"unicast.metric.gstatic.com", true, false, false},
    435. 

  435. -    {"unicast2-stb.metric.gstatic.com", true, false, false},
    436. 

  436. -    {"unicast2.metric.gstatic.com", true, false, false},
    437. 

  437. -    {"waze.com", true, false, false},
    438. 

  438. -    {"withgoogle.com", true, false, false},
    439. 

  439. -    {"youtu.be", true, false, false},
    440. 

  440. -    {"youtube-3rd-party.com", true, false, false},
    441. 

  441. -    {"youtube-nocookie.com", true, false, false},
    442. 

  442. -    {"youtube.ae", true, false, false},
    443. 

  443. -    {"youtube.al", true, false, false},
    444. 

  444. -    {"youtube.am", true, false, false},
    445. 

  445. -    {"youtube.at", true, false, false},
    446. 

  446. -    {"youtube.az", true, false, false},
    447. 

  447. -    {"youtube.ba", true, false, false},
    448. 

  448. -    {"youtube.be", true, false, false},
    449. 

  449. -    {"youtube.bg", true, false, false},
    450. 

  450. -    {"youtube.bh", true, false, false},
    451. 

  451. -    {"youtube.bo", true, false, false},
    452. 

  452. -    {"youtube.ca", true, false, false},
    453. 

  453. -    {"youtube.cat", true, false, false},
    454. 

  454. -    {"youtube.ch", true, false, false},
    455. 

  455. -    {"youtube.cl", true, false, false},
    456. 

  456. -    {"youtube.co", true, false, false},
    457. 

  457. -    {"youtube.co.ae", true, false, false},
    458. 

  458. -    {"youtube.co.at", true, false, false},
    459. 

  459. -    {"youtube.co.hu", true, false, false},
    460. 

  460. -    {"youtube.co.id", true, false, false},
    461. 

  461. -    {"youtube.co.il", true, false, false},
    462. 

  462. -    {"youtube.co.in", true, false, false},
    463. 

  463. -    {"youtube.co.jp", true, false, false},
    464. 

  464. -    {"youtube.co.ke", true, false, false},
    465. 

  465. -    {"youtube.co.kr", true, false, false},
    466. 

  466. -    {"youtube.co.ma", true, false, false},
    467. 

  467. -    {"youtube.co.nz", true, false, false},
    468. 

  468. -    {"youtube.co.th", true, false, false},
    469. 

  469. -    {"youtube.co.ug", true, false, false},
    470. 

  470. -    {"youtube.co.uk", true, false, false},
    471. 

  471. -    {"youtube.co.ve", true, false, false},
    472. 

  472. -    {"youtube.co.za", true, false, false},
    473. 

  473. -    {"youtube.com", true, false, false},
    474. 

  474. -    {"youtube.com.ar", true, false, false},
    475. 

  475. -    {"youtube.com.au", true, false, false},
    476. 

  476. -    {"youtube.com.az", true, false, false},
    477. 

  477. -    {"youtube.com.bh", true, false, false},
    478. 

  478. -    {"youtube.com.bo", true, false, false},
    479. 

  479. -    {"youtube.com.br", true, false, false},
    480. 

  480. -    {"youtube.com.by", true, false, false},
    481. 

  481. -    {"youtube.com.co", true, false, false},
    482. 

  482. -    {"youtube.com.do", true, false, false},
    483. 

  483. -    {"youtube.com.ee", true, false, false},
    484. 

  484. -    {"youtube.com.eg", true, false, false},
    485. 

  485. -    {"youtube.com.es", true, false, false},
    486. 

  486. -    {"youtube.com.gh", true, false, false},
    487. 

  487. -    {"youtube.com.gr", true, false, false},
    488. 

  488. -    {"youtube.com.gt", true, false, false},
    489. 

  489. -    {"youtube.com.hk", true, false, false},
    490. 

  490. -    {"youtube.com.hr", true, false, false},
    491. 

  491. -    {"youtube.com.jm", true, false, false},
    492. 

  492. -    {"youtube.com.jo", true, false, false},
    493. 

  493. -    {"youtube.com.kw", true, false, false},
    494. 

  494. -    {"youtube.com.lb", true, false, false},
    495. 

  495. -    {"youtube.com.lv", true, false, false},
    496. 

  496. -    {"youtube.com.mk", true, false, false},
    497. 

  497. -    {"youtube.com.mt", true, false, false},
    498. 

  498. -    {"youtube.com.mx", true, false, false},
    499. 

  499. -    {"youtube.com.my", true, false, false},
    500. 

  500. -    {"youtube.com.ng", true, false, false},
    501. 

  501. -    {"youtube.com.om", true, false, false},
    502. 

  502. -    {"youtube.com.pe", true, false, false},
    503. 

  503. -    {"youtube.com.ph", true, false, false},
    504. 

  504. -    {"youtube.com.pk", true, false, false},
    505. 

  505. -    {"youtube.com.pt", true, false, false},
    506. 

  506. -    {"youtube.com.qa", true, false, false},
    507. 

  507. -    {"youtube.com.ro", true, false, false},
    508. 

  508. -    {"youtube.com.sa", true, false, false},
    509. 

  509. -    {"youtube.com.sg", true, false, false},
    510. 

  510. -    {"youtube.com.tn", true, false, false},
    511. 

  511. -    {"youtube.com.tr", true, false, false},
    512. 

  512. -    {"youtube.com.tw", true, false, false},
    513. 

  513. -    {"youtube.com.ua", true, false, false},
    514. 

  514. -    {"youtube.com.uy", true, false, false},
    515. 

  515. -    {"youtube.com.ve", true, false, false},
    516. 

  516. -    {"youtube.cz", true, false, false},
    517. 

  517. -    {"youtube.de", true, false, false},
    518. 

  518. -    {"youtube.dk", true, false, false},
    519. 

  519. -    {"youtube.ee", true, false, false},
    520. 

  520. -    {"youtube.es", true, false, false},
    521. 

  521. -    {"youtube.fi", true, false, false},
    522. 

  522. -    {"youtube.fr", true, false, false},
    523. 

  523. -    {"youtube.ge", true, false, false},
    524. 

  524. -    {"youtube.gr", true, false, false},
    525. 

  525. -    {"youtube.gt", true, false, false},
    526. 

  526. -    {"youtube.hk", true, false, false},
    527. 

  527. -    {"youtube.hr", true, false, false},
    528. 

  528. -    {"youtube.hu", true, false, false},
    529. 

  529. -    {"youtube.ie", true, false, false},
    530. 

  530. -    {"youtube.in", true, false, false},
    531. 

  531. -    {"youtube.is", true, false, false},
    532. 

  532. -    {"youtube.it", true, false, false},
    533. 

  533. -    {"youtube.jo", true, false, false},
    534. 

  534. -    {"youtube.jp", true, false, false},
    535. 

  535. -    {"youtube.kr", true, false, false},
    536. 

  536. -    {"youtube.lk", true, false, false},
    537. 

  537. -    {"youtube.lt", true, false, false},
    538. 

  538. -    {"youtube.lv", true, false, false},
    539. 

  539. -    {"youtube.ma", true, false, false},
    540. 

  540. -    {"youtube.md", true, false, false},
    541. 

  541. -    {"youtube.me", true, false, false},
    542. 

  542. -    {"youtube.mk", true, false, false},
    543. 

  543. -    {"youtube.mx", true, false, false},
    544. 

  544. -    {"youtube.my", true, false, false},
    545. 

  545. -    {"youtube.ng", true, false, false},
    546. 

  546. -    {"youtube.nl", true, false, false},
    547. 

  547. -    {"youtube.no", true, false, false},
    548. 

  548. -    {"youtube.pe", true, false, false},
    549. 

  549. -    {"youtube.ph", true, false, false},
    550. 

  550. -    {"youtube.pk", true, false, false},
    551. 

  551. -    {"youtube.pl", true, false, false},
    552. 

  552. -    {"youtube.pr", true, false, false},
    553. 

  553. -    {"youtube.pt", true, false, false},
    554. 

  554. -    {"youtube.qa", true, false, false},
    555. 

  555. -    {"youtube.ro", true, false, false},
    556. 

  556. -    {"youtube.rs", true, false, false},
    557. 

  557. -    {"youtube.ru", true, false, false},
    558. 

  558. -    {"youtube.sa", true, false, false},
    559. 

  559. -    {"youtube.se", true, false, false},
    560. 

  560. -    {"youtube.sg", true, false, false},
    561. 

  561. -    {"youtube.si", true, false, false},
    562. 

  562. -    {"youtube.sk", true, false, false},
    563. 

  563. -    {"youtube.sn", true, false, false},
    564. 

  564. -    {"youtube.tn", true, false, false},
    565. 

  565. -    {"youtube.ua", true, false, false},
    566. 

  566. -    {"youtube.ug", true, false, false},
    567. 

  567. -    {"youtube.uy", true, false, false},
    568. 

  568. -    {"youtube.vn", true, false, false},
    569. 

  569. -    {"youtubeeducation.com", true, false, false},
    570. 

  570. -    {"youtubemobilesupport.com", true, false, false},
    571. 

  571. -    {"ytimg.com", true, false, false},
    572. 

  572. -
    573. 

  573. -    // Origins without subdomains and with same-origin collectors.
    574. 

  574. -    {"accounts.google.com", false, true, false},
    575. 

  575. -    {"apis.google.com", false, true, false},
    576. 

  576. -    {"app.google.stackdriver.com", false, true, false},
    577. 

  577. -    {"b.mail.google.com", false, true, false},
    578. 

  578. -    {"chatenabled.mail.google.com", false, true, false},
    579. 

  579. -    {"ddm.google.com", false, true, false},
    580. 

  580. -    {"gmail.com", false, true, false},
    581. 

  581. -    {"gmail.google.com", false, true, false},
    582. 

  582. -    {"mail-attachment.googleusercontent.com", false, true, false},
    583. 

  583. -    {"mail.google.com", false, true, false},
    584. 

  584. -    {"www.gmail.com", false, true, false},
    585. 

  585. -
    586. 

  586. -    // Origins without subdomains or same-origin collectors.
    587. 

  587. -    {"ad.doubleclick.net", false, false, false},
    588. 

  588. -    {"drive.google.com", false, false, false},
    589. 

  589. -    {"redirector.googlevideo.com", false, false, false},
    590. 

  590. -};
    591. 

  591. -
    592. 

  592. -const char* const kGoogleStandardCollectors[] = {
    593. 

  593. -    "https://beacons.gcp.gvt2.com/domainreliability/upload",
    594. 

  594. -    "https://beacons.gvt2.com/domainreliability/upload",
    595. 

  595. -    "https://beacons2.gvt2.com/domainreliability/upload",
    596. 

  596. -    "https://beacons3.gvt2.com/domainreliability/upload",
    597. 

  597. -    "https://beacons4.gvt2.com/domainreliability/upload",
    598. 

  598. -    "https://beacons5.gvt2.com/domainreliability/upload",
    599. 

  599. -    "https://beacons5.gvt3.com/domainreliability/upload",
    600. 

  600. -    "https://clients2.google.com/domainreliability/upload",
    601. 

  601. -};
    602. 

  602. -
    603. 

  603. -const char* const kGoogleOriginSpecificCollectorPathString =
    604. 

  604. -    "/domainreliability/upload";
    605. 

  605. -
    606. 

  606. -std::unique_ptr<const DomainReliabilityConfig> CreateGoogleConfig(
    607. 

  607. -    const GoogleConfigParams& params,
    608. 

  608. -    bool is_www) {
    609. 

  609. -  if (is_www)
    610. 

  610. -    DCHECK(params.duplicate_for_www);
    611. 

  611. -
    612. 

  612. -  std::string hostname = (is_www ? "www." : "") + std::string(params.hostname);
    613. 

  613. -  bool include_subdomains = params.include_subdomains && !is_www;
    614. 

  614. -
    615. 

  615. -  auto config = std::make_unique<DomainReliabilityConfig>();
    616. 

  616. -  config->origin = GURL("https://" + hostname + "/");
    617. 

  617. -  config->include_subdomains = include_subdomains;
    618. 

  618. -  config->collectors.clear();
    619. 

  619. -  if (params.include_origin_specific_collector) {
    620. 

  620. -    GURL::Replacements replacements;
    621. 

  621. -    replacements.SetPathStr(kGoogleOriginSpecificCollectorPathString);
    622. 

  622. -    config->collectors.push_back(
    623. 

  623. -        std::make_unique<GURL>(config->origin.ReplaceComponents(replacements)));
    624. 

  624. -  }
    625. 

  625. -  for (const char* collector : kGoogleStandardCollectors) {
    626. 

  626. -    config->collectors.push_back(std::make_unique<GURL>(collector));
    627. 

  627. -  }
    628. 

  628. -  config->success_sample_rate = 0.05;
    629. 

  629. -  config->failure_sample_rate = 1.00;
    630. 

  630. -  config->path_prefixes.clear();
    631. 

  631. -  return config;
    632. 

  632. -}
    633. 

  633. -
    634. 

  634. -}  // namespace
    635. 

  635. -
    636. 

  636.  std::unique_ptr<const DomainReliabilityConfig> MaybeGetGoogleConfig(
    637. 

  637.      const std::string& hostname) {
    638. 

  638.    bool is_www_subdomain =
    639. 

  639. @@ -577,23 +19,6 @@ std::unique_ptr<const DomainReliabilityC
    640. 

  640.    std::unique_ptr<const DomainReliabilityConfig> config = nullptr;
    641. 

  641.    std::unique_ptr<const DomainReliabilityConfig> superdomain_config = nullptr;
    642. 

  642.  
    643. 

  643. -  for (const auto& params : kGoogleConfigs) {
    644. 

  644. -    if (params.hostname == hostname) {
    645. 

  645. -      config = CreateGoogleConfig(params, false);
    646. 

  646. -      break;
    647. 

  647. -    }
    648. 

  648. -    if (params.duplicate_for_www && is_www_subdomain &&
    649. 

  649. -        params.hostname == hostname_parent) {
    650. 

  650. -      config = CreateGoogleConfig(params, true);
    651. 

  651. -      break;
    652. 

  652. -    }
    653. 

  653. -    // Don't break out of the loop upon finding a superdomain config, because
    654. 

  654. -    // there might be an exact match later on.
    655. 

  655. -    if (params.include_subdomains && params.hostname == hostname_parent) {
    656. 

  656. -      superdomain_config = CreateGoogleConfig(params, false);
    657. 

  657. -    }
    658. 

  658. -  }
    659. 

  659. -
    660. 

  660.    if (config) {
    661. 

  661.      DCHECK(config->origin.host() == hostname);
    662. 

  662.      return config;
    663. 

  663. @@ -611,12 +36,7 @@ std::unique_ptr<const DomainReliabilityC
    664. 

  664.  std::vector<std::unique_ptr<const DomainReliabilityConfig>>
    665. 

  665.  GetAllGoogleConfigsForTesting() {
    666. 

  666.    std::vector<std::unique_ptr<const DomainReliabilityConfig>> configs_out;
    667. 

  667. -
    668. 

  668. -  for (const auto& params : kGoogleConfigs) {
    669. 

  669. -    configs_out.push_back(CreateGoogleConfig(params, false));
    670. 

  670. -    if (params.duplicate_for_www)
    671. 

  671. -      configs_out.push_back(CreateGoogleConfig(params, true));
    672. 

  672. -  }
    673. 

  673. +
    674. 

  674.    return configs_out;
    675. 

  675.  }
    676. 

  676.  
    677. 

  677. --- a/components/domain_reliability/uploader.cc
    678. 

  678. +++ b/components/domain_reliability/uploader.cc
    679. 

  679. @@ -82,7 +82,7 @@ class DomainReliabilityUploaderImpl
    680. 

  680.      if (discard_uploads_)
    681. 

  681.        discarded_upload_count_++;
    682. 

  682.  
    683. 

  683. -    if (discard_uploads_ || shutdown_) {
    684. 

  684. +    if (true) {
    685. 

  685.        DVLOG(1) << "Discarding report instead of uploading.";
    686. 

  686.        UploadResult result;
    687. 

  687.        result.status = UploadResult::SUCCESS;
    688.