summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorttuttle <ttuttle@chromium.org>2016-02-26 16:12:09 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-27 00:13:49 +0000
commit6fb41398844159d23b37ab41382d950c75cb5ac6 (patch)
tree6c976775002a5058395847cd74948005ec45281e
parent133ff5f7e4921bb69e638119edddd9e7cc4ef15f (diff)
downloadchromium_src-6fb41398844159d23b37ab41382d950c75cb5ac6.zip
chromium_src-6fb41398844159d23b37ab41382d950c75cb5ac6.tar.gz
chromium_src-6fb41398844159d23b37ab41382d950c75cb5ac6.tar.bz2
Domain Reliability: Add more Gmail domains
BUG= Review URL: https://codereview.chromium.org/1733463005 Cr-Commit-Position: refs/heads/master@{#378033}
-rw-r--r--components/domain_reliability.gypi1
-rw-r--r--components/domain_reliability/BUILD.gn4
-rw-r--r--components/domain_reliability/baked_in_configs.gypi1
-rw-r--r--components/domain_reliability/baked_in_configs/mail_google_com.json20
-rw-r--r--components/domain_reliability/google_configs.cc7
5 files changed, 10 insertions, 23 deletions
diff --git a/components/domain_reliability.gypi b/components/domain_reliability.gypi
index 6b53ab2..fbd1314 100644
--- a/components/domain_reliability.gypi
+++ b/components/domain_reliability.gypi
@@ -70,6 +70,7 @@
'inputs': [
'<(bake_in_configs_script)',
'<@(baked_in_configs)',
+ 'domain_reliability/baked_in_configs.gypi',
],
'outputs': [
'<(baked_in_configs_cc)'
diff --git a/components/domain_reliability/BUILD.gn b/components/domain_reliability/BUILD.gn
index a0fb15f..5834a82 100644
--- a/components/domain_reliability/BUILD.gn
+++ b/components/domain_reliability/BUILD.gn
@@ -23,7 +23,7 @@ action("bake_in_configs") {
visibility = [ ":*" ]
script = "bake_in_configs.py"
- inputs = baked_in_configs
+ inputs = baked_in_configs + [ "baked_in_configs.gypi" ]
output_file = "$target_gen_dir/baked_in_configs.cc"
outputs = [
output_file,
@@ -31,7 +31,7 @@ action("bake_in_configs") {
# The JSON file list is too long for the command line on Windows, so put
# them in a response file.
- response_file_contents = rebase_path(inputs, root_build_dir)
+ response_file_contents = rebase_path(baked_in_configs, root_build_dir)
args = [
"--file-list",
"{{response_file_name}}",
diff --git a/components/domain_reliability/baked_in_configs.gypi b/components/domain_reliability/baked_in_configs.gypi
index eebb3ac..a872ef8 100644
--- a/components/domain_reliability/baked_in_configs.gypi
+++ b/components/domain_reliability/baked_in_configs.gypi
@@ -20,7 +20,6 @@
'domain_reliability/baked_in_configs/googlevideo_com.json',
'domain_reliability/baked_in_configs/gvt1_com.json',
'domain_reliability/baked_in_configs/gvt2_com.json',
- 'domain_reliability/baked_in_configs/mail_google_com.json',
'domain_reliability/baked_in_configs/ssl_gstatic_com.json',
'domain_reliability/baked_in_configs/www_google_com.json',
],
diff --git a/components/domain_reliability/baked_in_configs/mail_google_com.json b/components/domain_reliability/baked_in_configs/mail_google_com.json
deleted file mode 100644
index 5a7026d..0000000
--- a/components/domain_reliability/baked_in_configs/mail_google_com.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "origin": "https://mail.google.com/",
- "has_same_origin_collector": true,
- "success_sample_rate": 0.05,
- "collectors": [
- "https://beacons.gvt2.com/domainreliability/upload",
- "https://beacons2.gvt2.com/domainreliability/upload",
- "https://beacons3.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,
- "path_prefixes": [
- "/*/channel/bind",
- ""
- ]
-}
diff --git a/components/domain_reliability/google_configs.cc b/components/domain_reliability/google_configs.cc
index 5063b56..0e0647c 100644
--- a/components/domain_reliability/google_configs.cc
+++ b/components/domain_reliability/google_configs.cc
@@ -479,7 +479,14 @@ const GoogleConfigParams kGoogleConfigs[] = {
// Origins without subdomains and with same-origin collectors.
{ "accounts.google.com", false, true, false },
{ "apis.google.com", false, true, false },
+ { "b.mail.google.com", false, true, false },
+ { "chatenabled.mail.google.com", false, true, false },
{ "ddm.google.com", false, true, false },
+ { "gmail.com", false, true, false },
+ { "gmail.google.com", false, true, false },
+ { "mail.google.com", false, true, false },
+ { "mail-attachment.googleusercontent.com", false, true, false },
+ { "www.gmail.com", false, true, false },
// Origins without subdomains or same-origin collectors.
{ "ad.doubleclick.net", false, false, false },