Domain Reliability: Update configs and google_configs.cc

BUG=

Review URL: https://codereview.chromium.org/1573243014

Cr-Commit-Position: refs/heads/master@{#369569}

20 files changed, 80 insertions, 40 deletions

diff --git a/components/domain_reliability/baked_in_configs/c_2mdn_net.json b/components/domain_reliability/baked_in_configs/c_2mdn_net.json
index de19e02..30d052e 100644
--- a/components/domain_reliability/baked_in_configs/c_2mdn_net.json
+++ b/components/domain_reliability/baked_in_configs/c_2mdn_net.json
@@ -5,9 +5,11 @@
   "collectors": [
     "https://beacons.gvt2.com/domainreliability/upload",
     "https://beacons2.gvt2.com/domainreliability/upload",
-    "https://clients2.google.com/domainreliability/upload",
     "https://beacons3.gvt2.com/domainreliability/upload",
-    "https://beacons4.gvt2.com/domainreliability/upload"
+    "https://beacons4.gvt2.com/domainreliability/upload",
+    "https://beacons5.gvt2.com/domainreliability/upload",
+    "https://beacons5.gvt3.com/domainreliability/upload",
+    "https://clients2.google.com/domainreliability/upload"
   ],
   "failure_sample_rate": 1.0,
   "include_subdomains": true,
diff --git a/components/domain_reliability/baked_in_configs/c_android_clients_google_com.json b/components/domain_reliability/baked_in_configs/c_android_clients_google_com.json
index 339122b..5a2c892 100644
--- a/components/domain_reliability/baked_in_configs/c_android_clients_google_com.json
+++ b/components/domain_reliability/baked_in_configs/c_android_clients_google_com.json
@@ -5,9 +5,11 @@
   "collectors": [
     "https://beacons.gvt2.com/domainreliability/upload",
     "https://beacons2.gvt2.com/domainreliability/upload",
-    "https://clients2.google.com/domainreliability/upload",
     "https://beacons3.gvt2.com/domainreliability/upload",
-    "https://beacons4.gvt2.com/domainreliability/upload"
+    "https://beacons4.gvt2.com/domainreliability/upload",
+    "https://beacons5.gvt2.com/domainreliability/upload",
+    "https://beacons5.gvt3.com/domainreliability/upload",
+    "https://clients2.google.com/domainreliability/upload"
   ],
   "failure_sample_rate": 1.0,
   "include_subdomains": true,
diff --git a/components/domain_reliability/baked_in_configs/c_bigcache_googleapis_com.json b/components/domain_reliability/baked_in_configs/c_bigcache_googleapis_com.json
index ca885fd..265d64c 100644
--- a/components/domain_reliability/baked_in_configs/c_bigcache_googleapis_com.json
+++ b/components/domain_reliability/baked_in_configs/c_bigcache_googleapis_com.json
@@ -5,9 +5,11 @@
   "collectors": [
     "https://beacons.gvt2.com/domainreliability/upload",
     "https://beacons2.gvt2.com/domainreliability/upload",
-    "https://clients2.google.com/domainreliability/upload",
     "https://beacons3.gvt2.com/domainreliability/upload",
-    "https://beacons4.gvt2.com/domainreliability/upload"
+    "https://beacons4.gvt2.com/domainreliability/upload",
+    "https://beacons5.gvt2.com/domainreliability/upload",
+    "https://beacons5.gvt3.com/domainreliability/upload",
+    "https://clients2.google.com/domainreliability/upload"
   ],
   "failure_sample_rate": 1.0,
   "include_subdomains": true,
diff --git a/components/domain_reliability/baked_in_configs/c_doc-0-0-sj_sj_googleusercontent_com.json b/components/domain_reliability/baked_in_configs/c_doc-0-0-sj_sj_googleusercontent_com.json
index 2405ffb..4598487 100644
--- a/components/domain_reliability/baked_in_configs/c_doc-0-0-sj_sj_googleusercontent_com.json
+++ b/components/domain_reliability/baked_in_configs/c_doc-0-0-sj_sj_googleusercontent_com.json
@@ -5,9 +5,11 @@
   "collectors": [
     "https://beacons.gvt2.com/domainreliability/upload",
     "https://beacons2.gvt2.com/domainreliability/upload",
-    "https://clients2.google.com/domainreliability/upload",
     "https://beacons3.gvt2.com/domainreliability/upload",
-    "https://beacons4.gvt2.com/domainreliability/upload"
+    "https://beacons4.gvt2.com/domainreliability/upload",
+    "https://beacons5.gvt2.com/domainreliability/upload",
+    "https://beacons5.gvt3.com/domainreliability/upload",
+    "https://clients2.google.com/domainreliability/upload"
   ],
   "failure_sample_rate": 1.0,
   "include_subdomains": true,
diff --git a/components/domain_reliability/baked_in_configs/c_docs_google_com.json b/components/domain_reliability/baked_in_configs/c_docs_google_com.json
index fc1f68e..b94b23a 100644
--- a/components/domain_reliability/baked_in_configs/c_docs_google_com.json
+++ b/components/domain_reliability/baked_in_configs/c_docs_google_com.json
@@ -5,9 +5,11 @@
   "collectors": [
     "https://beacons.gvt2.com/domainreliability/upload",
     "https://beacons2.gvt2.com/domainreliability/upload",
-    "https://clients2.google.com/domainreliability/upload",
     "https://beacons3.gvt2.com/domainreliability/upload",
-    "https://beacons4.gvt2.com/domainreliability/upload"
+    "https://beacons4.gvt2.com/domainreliability/upload",
+    "https://beacons5.gvt2.com/domainreliability/upload",
+    "https://beacons5.gvt3.com/domainreliability/upload",
+    "https://clients2.google.com/domainreliability/upload"
   ],
   "failure_sample_rate": 1.0,
   "include_subdomains": true,
diff --git a/components/domain_reliability/baked_in_configs/c_drive_google_com.json b/components/domain_reliability/baked_in_configs/c_drive_google_com.json
index 0ca59301..b8b9ed9 100644
--- a/components/domain_reliability/baked_in_configs/c_drive_google_com.json
+++ b/components/domain_reliability/baked_in_configs/c_drive_google_com.json
@@ -5,9 +5,11 @@
   "collectors": [
     "https://beacons.gvt2.com/domainreliability/upload",
     "https://beacons2.gvt2.com/domainreliability/upload",
-    "https://clients2.google.com/domainreliability/upload",
     "https://beacons3.gvt2.com/domainreliability/upload",
-    "https://beacons4.gvt2.com/domainreliability/upload"
+    "https://beacons4.gvt2.com/domainreliability/upload",
+    "https://beacons5.gvt2.com/domainreliability/upload",
+    "https://beacons5.gvt3.com/domainreliability/upload",
+    "https://clients2.google.com/domainreliability/upload"
   ],
   "failure_sample_rate": 1.0,
   "include_subdomains": true,
diff --git a/components/domain_reliability/baked_in_configs/c_googlesyndication_com.json b/components/domain_reliability/baked_in_configs/c_googlesyndication_com.json
index 09caecb..6ef1773 100644
--- a/components/domain_reliability/baked_in_configs/c_googlesyndication_com.json
+++ b/components/domain_reliability/baked_in_configs/c_googlesyndication_com.json
@@ -5,9 +5,11 @@
   "collectors": [
     "https://beacons.gvt2.com/domainreliability/upload",
     "https://beacons2.gvt2.com/domainreliability/upload",
-    "https://clients2.google.com/domainreliability/upload",
     "https://beacons3.gvt2.com/domainreliability/upload",
-    "https://beacons4.gvt2.com/domainreliability/upload"
+    "https://beacons4.gvt2.com/domainreliability/upload",
+    "https://beacons5.gvt2.com/domainreliability/upload",
+    "https://beacons5.gvt3.com/domainreliability/upload",
+    "https://clients2.google.com/domainreliability/upload"
   ],
   "failure_sample_rate": 1.0,
   "include_subdomains": true,
diff --git a/components/domain_reliability/baked_in_configs/c_pack_google_com.json b/components/domain_reliability/baked_in_configs/c_pack_google_com.json
index f08ff5b..e054887 100644
--- a/components/domain_reliability/baked_in_configs/c_pack_google_com.json
+++ b/components/domain_reliability/baked_in_configs/c_pack_google_com.json
@@ -5,9 +5,11 @@
   "collectors": [
     "https://beacons.gvt2.com/domainreliability/upload",
     "https://beacons2.gvt2.com/domainreliability/upload",
-    "https://clients2.google.com/domainreliability/upload",
     "https://beacons3.gvt2.com/domainreliability/upload",
-    "https://beacons4.gvt2.com/domainreliability/upload"
+    "https://beacons4.gvt2.com/domainreliability/upload",
+    "https://beacons5.gvt2.com/domainreliability/upload",
+    "https://beacons5.gvt3.com/domainreliability/upload",
+    "https://clients2.google.com/domainreliability/upload"
   ],
   "failure_sample_rate": 1.0,
   "include_subdomains": true,
diff --git a/components/domain_reliability/baked_in_configs/c_play_google_com.json b/components/domain_reliability/baked_in_configs/c_play_google_com.json
index 99597f6..1cd6a34 100644
--- a/components/domain_reliability/baked_in_configs/c_play_google_com.json
+++ b/components/domain_reliability/baked_in_configs/c_play_google_com.json
@@ -5,9 +5,11 @@
   "collectors": [
     "https://beacons.gvt2.com/domainreliability/upload",
     "https://beacons2.gvt2.com/domainreliability/upload",
-    "https://clients2.google.com/domainreliability/upload",
     "https://beacons3.gvt2.com/domainreliability/upload",
-    "https://beacons4.gvt2.com/domainreliability/upload"
+    "https://beacons4.gvt2.com/domainreliability/upload",
+    "https://beacons5.gvt2.com/domainreliability/upload",
+    "https://beacons5.gvt3.com/domainreliability/upload",
+    "https://clients2.google.com/domainreliability/upload"
   ],
   "failure_sample_rate": 1.0,
   "include_subdomains": true,
diff --git a/components/domain_reliability/baked_in_configs/c_youtube_com.json b/components/domain_reliability/baked_in_configs/c_youtube_com.json
index fff2150..8f0f35e 100644
--- a/components/domain_reliability/baked_in_configs/c_youtube_com.json
+++ b/components/domain_reliability/baked_in_configs/c_youtube_com.json
@@ -5,9 +5,11 @@
   "collectors": [
     "https://beacons.gvt2.com/domainreliability/upload",
     "https://beacons2.gvt2.com/domainreliability/upload",
-    "https://clients2.google.com/domainreliability/upload",
     "https://beacons3.gvt2.com/domainreliability/upload",
-    "https://beacons4.gvt2.com/domainreliability/upload"
+    "https://beacons4.gvt2.com/domainreliability/upload",
+    "https://beacons5.gvt2.com/domainreliability/upload",
+    "https://beacons5.gvt3.com/domainreliability/upload",
+    "https://clients2.google.com/domainreliability/upload"
   ],
   "failure_sample_rate": 1.0,
   "include_subdomains": true,
diff --git a/components/domain_reliability/baked_in_configs/clients2_google_com.json b/components/domain_reliability/baked_in_configs/clients2_google_com.json
index 591affa..a3ec5db 100644
--- a/components/domain_reliability/baked_in_configs/clients2_google_com.json
+++ b/components/domain_reliability/baked_in_configs/clients2_google_com.json
@@ -5,9 +5,11 @@
   "collectors": [
     "https://beacons.gvt2.com/domainreliability/upload",
     "https://beacons2.gvt2.com/domainreliability/upload",
-    "https://clients2.google.com/domainreliability/upload",
     "https://beacons3.gvt2.com/domainreliability/upload",
-    "https://beacons4.gvt2.com/domainreliability/upload"
+    "https://beacons4.gvt2.com/domainreliability/upload",
+    "https://beacons5.gvt2.com/domainreliability/upload",
+    "https://beacons5.gvt3.com/domainreliability/upload",
+    "https://clients2.google.com/domainreliability/upload"
   ],
   "failure_sample_rate": 1.0,
   "include_subdomains": false,
diff --git a/components/domain_reliability/baked_in_configs/docs_google_com.json b/components/domain_reliability/baked_in_configs/docs_google_com.json
index 93654f5..01ec7e7 100644
--- a/components/domain_reliability/baked_in_configs/docs_google_com.json
+++ b/components/domain_reliability/baked_in_configs/docs_google_com.json
@@ -5,9 +5,11 @@
   "collectors": [
     "https://beacons.gvt2.com/domainreliability/upload",
     "https://beacons2.gvt2.com/domainreliability/upload",
-    "https://clients2.google.com/domainreliability/upload",
     "https://beacons3.gvt2.com/domainreliability/upload",
-    "https://beacons4.gvt2.com/domainreliability/upload"
+    "https://beacons4.gvt2.com/domainreliability/upload",
+    "https://beacons5.gvt2.com/domainreliability/upload",
+    "https://beacons5.gvt3.com/domainreliability/upload",
+    "https://clients2.google.com/domainreliability/upload"
   ],
   "failure_sample_rate": 1.0,
   "include_subdomains": false,
diff --git a/components/domain_reliability/baked_in_configs/google-analytics_com.json b/components/domain_reliability/baked_in_configs/google-analytics_com.json
index e7e355e..6bd103b 100644
--- a/components/domain_reliability/baked_in_configs/google-analytics_com.json
+++ b/components/domain_reliability/baked_in_configs/google-analytics_com.json
@@ -5,9 +5,11 @@
   "collectors": [
     "https://beacons.gvt2.com/domainreliability/upload",
     "https://beacons2.gvt2.com/domainreliability/upload",
-    "https://clients2.google.com/domainreliability/upload",
     "https://beacons3.gvt2.com/domainreliability/upload",
-    "https://beacons4.gvt2.com/domainreliability/upload"
+    "https://beacons4.gvt2.com/domainreliability/upload",
+    "https://beacons5.gvt2.com/domainreliability/upload",
+    "https://beacons5.gvt3.com/domainreliability/upload",
+    "https://clients2.google.com/domainreliability/upload"
   ],
   "failure_sample_rate": 1.0,
   "include_subdomains": true,
diff --git a/components/domain_reliability/baked_in_configs/googlevideo_com.json b/components/domain_reliability/baked_in_configs/googlevideo_com.json
index 158f3c0..4f4f274 100644
--- a/components/domain_reliability/baked_in_configs/googlevideo_com.json
+++ b/components/domain_reliability/baked_in_configs/googlevideo_com.json
@@ -5,9 +5,11 @@
   "collectors": [
     "https://beacons.gvt2.com/domainreliability/upload",
     "https://beacons2.gvt2.com/domainreliability/upload",
-    "https://clients2.google.com/domainreliability/upload",
     "https://beacons3.gvt2.com/domainreliability/upload",
-    "https://beacons4.gvt2.com/domainreliability/upload"
+    "https://beacons4.gvt2.com/domainreliability/upload",
+    "https://beacons5.gvt2.com/domainreliability/upload",
+    "https://beacons5.gvt3.com/domainreliability/upload",
+    "https://clients2.google.com/domainreliability/upload"
   ],
   "failure_sample_rate": 1.0,
   "include_subdomains": true,
diff --git a/components/domain_reliability/baked_in_configs/gvt1_com.json b/components/domain_reliability/baked_in_configs/gvt1_com.json
index 406960f..509639b 100644
--- a/components/domain_reliability/baked_in_configs/gvt1_com.json
+++ b/components/domain_reliability/baked_in_configs/gvt1_com.json
@@ -5,9 +5,11 @@
   "collectors": [
     "https://beacons.gvt2.com/domainreliability/upload",
     "https://beacons2.gvt2.com/domainreliability/upload",
-    "https://clients2.google.com/domainreliability/upload",
     "https://beacons3.gvt2.com/domainreliability/upload",
-    "https://beacons4.gvt2.com/domainreliability/upload"
+    "https://beacons4.gvt2.com/domainreliability/upload",
+    "https://beacons5.gvt2.com/domainreliability/upload",
+    "https://beacons5.gvt3.com/domainreliability/upload",
+    "https://clients2.google.com/domainreliability/upload"
   ],
   "failure_sample_rate": 1.0,
   "include_subdomains": true,
diff --git a/components/domain_reliability/baked_in_configs/gvt2_com.json b/components/domain_reliability/baked_in_configs/gvt2_com.json
index 39f0f3e..cc696b9 100644
--- a/components/domain_reliability/baked_in_configs/gvt2_com.json
+++ b/components/domain_reliability/baked_in_configs/gvt2_com.json
@@ -5,9 +5,11 @@
   "collectors": [
     "https://beacons.gvt2.com/domainreliability/upload",
     "https://beacons2.gvt2.com/domainreliability/upload",
-    "https://clients2.google.com/domainreliability/upload",
     "https://beacons3.gvt2.com/domainreliability/upload",
-    "https://beacons4.gvt2.com/domainreliability/upload"
+    "https://beacons4.gvt2.com/domainreliability/upload",
+    "https://beacons5.gvt2.com/domainreliability/upload",
+    "https://beacons5.gvt3.com/domainreliability/upload",
+    "https://clients2.google.com/domainreliability/upload"
   ],
   "failure_sample_rate": 1.0,
   "include_subdomains": true,
diff --git a/components/domain_reliability/baked_in_configs/mail_google_com.json b/components/domain_reliability/baked_in_configs/mail_google_com.json
index 0b0a462..5a7026d 100644
--- a/components/domain_reliability/baked_in_configs/mail_google_com.json
+++ b/components/domain_reliability/baked_in_configs/mail_google_com.json
@@ -5,9 +5,11 @@
   "collectors": [
     "https://beacons.gvt2.com/domainreliability/upload",
     "https://beacons2.gvt2.com/domainreliability/upload",
-    "https://clients2.google.com/domainreliability/upload",
     "https://beacons3.gvt2.com/domainreliability/upload",
-    "https://beacons4.gvt2.com/domainreliability/upload"
+    "https://beacons4.gvt2.com/domainreliability/upload",
+    "https://beacons5.gvt2.com/domainreliability/upload",
+    "https://beacons5.gvt3.com/domainreliability/upload",
+    "https://clients2.google.com/domainreliability/upload"
   ],
   "failure_sample_rate": 1.0,
   "include_subdomains": false,
diff --git a/components/domain_reliability/baked_in_configs/ssl_gstatic_com.json b/components/domain_reliability/baked_in_configs/ssl_gstatic_com.json
index ac962a4..dc98977 100644
--- a/components/domain_reliability/baked_in_configs/ssl_gstatic_com.json
+++ b/components/domain_reliability/baked_in_configs/ssl_gstatic_com.json
@@ -5,9 +5,11 @@
   "collectors": [
     "https://beacons.gvt2.com/domainreliability/upload",
     "https://beacons2.gvt2.com/domainreliability/upload",
-    "https://clients2.google.com/domainreliability/upload",
     "https://beacons3.gvt2.com/domainreliability/upload",
-    "https://beacons4.gvt2.com/domainreliability/upload"
+    "https://beacons4.gvt2.com/domainreliability/upload",
+    "https://beacons5.gvt2.com/domainreliability/upload",
+    "https://beacons5.gvt3.com/domainreliability/upload",
+    "https://clients2.google.com/domainreliability/upload"
   ],
   "failure_sample_rate": 1.0,
   "include_subdomains": false,
diff --git a/components/domain_reliability/baked_in_configs/www_google_com.json b/components/domain_reliability/baked_in_configs/www_google_com.json
index f483f84..d1c9fdd 100644
--- a/components/domain_reliability/baked_in_configs/www_google_com.json
+++ b/components/domain_reliability/baked_in_configs/www_google_com.json
@@ -5,9 +5,11 @@
   "collectors": [
     "https://beacons.gvt2.com/domainreliability/upload",
     "https://beacons2.gvt2.com/domainreliability/upload",
-    "https://clients2.google.com/domainreliability/upload",
     "https://beacons3.gvt2.com/domainreliability/upload",
-    "https://beacons4.gvt2.com/domainreliability/upload"
+    "https://beacons4.gvt2.com/domainreliability/upload",
+    "https://beacons5.gvt2.com/domainreliability/upload",
+    "https://beacons5.gvt3.com/domainreliability/upload",
+    "https://clients2.google.com/domainreliability/upload"
   ],
   "failure_sample_rate": 1.0,
   "include_subdomains": false,
diff --git a/components/domain_reliability/google_configs.cc b/components/domain_reliability/google_configs.cc
index 6582a08..5063b56 100644
--- a/components/domain_reliability/google_configs.cc
+++ b/components/domain_reliability/google_configs.cc
@@ -490,9 +490,11 @@ const GoogleConfigParams kGoogleConfigs[] = {
 const char* kGoogleStandardCollectors[] = {
   "https://beacons.gvt2.com/domainreliability/upload",
   "https://beacons2.gvt2.com/domainreliability/upload",
-  "https://clients2.google.com/domainreliability/upload",
   "https://beacons3.gvt2.com/domainreliability/upload",
-  "https://beacons4.gvt2.com/domainreliability/upload"
+  "https://beacons4.gvt2.com/domainreliability/upload",
+  "https://beacons5.gvt2.com/domainreliability/upload",
+  "https://beacons5.gvt3.com/domainreliability/upload",
+  "https://clients2.google.com/domainreliability/upload",
 };
 
 const char* kGoogleOriginSpecificCollectorPathString =