Index: components/domain_reliability/google_configs.cc |
diff --git a/components/domain_reliability/google_configs.cc b/components/domain_reliability/google_configs.cc |
index 740673d699c18e8e11d0b75d2ea18e40da7a78d9..f3147c30f3ac53e240100f32bc7cbff24213d4a8 100644 |
--- a/components/domain_reliability/google_configs.cc |
+++ b/components/domain_reliability/google_configs.cc |
@@ -31,7 +31,9 @@ struct GoogleConfigParams { |
}; |
const GoogleConfigParams kGoogleConfigs[] = { |
- // Origins with subdomains and same-origin collectors. |
+ // Origins with subdomains and same-origin collectors. Currently, all |
+ // origins with same-origin collectors also run collectors on their www |
+ // subdomain. (e.g., both foo.com and www.foo.com.) |
{ "google.ac", true, true, true }, |
{ "google.ad", true, true, true }, |
{ "google.ae", true, true, true }, |
@@ -88,7 +90,6 @@ const GoogleConfigParams kGoogleConfigs[] = { |
{ "google.co.za", true, true, true }, |
{ "google.co.zm", true, true, true }, |
{ "google.co.zw", true, true, true }, |
- { "google.com", true, true, false }, |
{ "google.com.af", true, true, true }, |
{ "google.com.ag", true, true, true }, |
{ "google.com.ai", true, true, true }, |
@@ -254,6 +255,10 @@ const GoogleConfigParams kGoogleConfigs[] = { |
{ "google.ws", true, true, true }, |
{ "l.google.com", true, true, true }, |
+ // google.com is a special case. We have a custom config for www.google.com, |
+ // so set generate_config_for_www_subdomain = false. |
+ { "google.com", true, true, false }, |
+ |
// Origins with subdomains and without same-origin collectors. |
{ "2mdn.net", true, false, false }, |
{ "adgoogle.net", true, false, false }, |
@@ -293,8 +298,8 @@ const GoogleConfigParams kGoogleConfigs[] = { |
{ "adwhirl.com", true, false, false }, |
{ "android.com", true, false, false }, |
{ "anycast-edge.metric.gstatic.com", true, false, false }, |
- { "anycast1.metric.gstatic.com", true, false, false }, |
- { "anycast1-stb.metric.gstatic.com", true, false, false }, |
+ { "anycast-stb.metric.gstatic.com", true, false, false }, |
+ { "anycast.metric.gstatic.com", true, false, false }, |
{ "chromecast.com", true, false, false }, |
{ "chromeexperiments.com", true, false, false }, |
{ "chromestatus.com", true, false, false }, |
@@ -343,22 +348,24 @@ const GoogleConfigParams kGoogleConfigs[] = { |
{ "googleusercontent.com", true, false, false }, |
{ "gstatic.cn", true, false, false }, |
{ "gstatic.com", true, false, false }, |
+ { "gvt3.com", true, false, false }, |
+ { "gvt9.com", true, false, false }, |
{ "picasa.com", true, false, false }, |
{ "recaptcha.net", true, false, false }, |
{ "stackdriver.com", true, false, false }, |
- { "stbcast.metric.gstatic.com", true, false, false }, |
- { "stbcast2.metric.gstatic.com", true, false, false }, |
- { "stbcast3.metric.gstatic.com", true, false, false }, |
- { "stbcast4.metric.gstatic.com", true, false, false }, |
{ "stbcast-stb.metric.gstatic.com", true, false, false }, |
+ { "stbcast.metric.gstatic.com", true, false, false }, |
{ "stbcast2-stb.metric.gstatic.com", true, false, false }, |
+ { "stbcast2.metric.gstatic.com", true, false, false }, |
{ "stbcast3-stb.metric.gstatic.com", true, false, false }, |
+ { "stbcast3.metric.gstatic.com", true, false, false }, |
{ "stbcast4-stb.metric.gstatic.com", true, false, false }, |
- { "unicast.metric.gstatic.com", true, false, false }, |
+ { "stbcast4.metric.gstatic.com", true, false, false }, |
{ "unicast-edge.metric.gstatic.com", true, false, false }, |
{ "unicast-stb.metric.gstatic.com", true, false, false }, |
- { "unicast2.metric.gstatic.com", true, false, false }, |
+ { "unicast.metric.gstatic.com", true, false, false }, |
{ "unicast2-stb.metric.gstatic.com", true, false, false }, |
+ { "unicast2.metric.gstatic.com", true, false, false }, |
{ "waze.com", true, false, false }, |
{ "withgoogle.com", true, false, false }, |
{ "youtu.be", true, false, false }, |
@@ -503,8 +510,8 @@ const GoogleConfigParams kGoogleConfigs[] = { |
{ "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 }, |
+ { "mail.google.com", false, true, false }, |
{ "www.gmail.com", false, true, false }, |
// Origins without subdomains or same-origin collectors. |