Domain Reliability: Update baked-in configs, add more

Add a bunch more baked-in configs, and update the existing ones.
Also, improve bake_in_configs.py so it will display multiple errors before
failing, and re-enable the unit test that failed when the existing configs
expired.

BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283657 0039d316-1c4b-4281-b951-d872f2087c98

components/domain_reliability.gypi

@@ -53,12 +53,40 @@
             'baked_in_configs_cc':
                 '<(INTERMEDIATE_DIR)/domain_reliability/baked_in_configs.cc',
             'baked_in_configs': [
+              'domain_reliability/baked_in_configs/accounts_google_com.json',
+              'domain_reliability/baked_in_configs/ad_doubleclick_net.json',
               'domain_reliability/baked_in_configs/apis_google_com.json',
+              'domain_reliability/baked_in_configs/c_admob_com.json',
+              'domain_reliability/baked_in_configs/csi_gstatic_com.json',
               'domain_reliability/baked_in_configs/ddm_google_com.json',
+              'domain_reliability/baked_in_configs/docs_google_com.json',
               'domain_reliability/baked_in_configs/drive_google_com.json',
+              'domain_reliability/baked_in_configs/e_admob_com.json',
+              'domain_reliability/baked_in_configs/fonts_googleapis_com.json',
+              'domain_reliability/baked_in_configs/googleads4_g_doubleclick_net.json',
+              'domain_reliability/baked_in_configs/googleads_g_doubleclick_net.json',
+              'domain_reliability/baked_in_configs/gstatic_com.json',
+              'domain_reliability/baked_in_configs/lh3_ggpht_com.json',
+              'domain_reliability/baked_in_configs/lh4_ggpht_com.json',
+              'domain_reliability/baked_in_configs/lh5_ggpht_com.json',
+              'domain_reliability/baked_in_configs/lh6_ggpht_com.json',
               'domain_reliability/baked_in_configs/mail_google_com.json',
+              'domain_reliability/baked_in_configs/media_admob_com.json',
+              'domain_reliability/baked_in_configs/pagead2_googlesyndication_com.json',
+              'domain_reliability/baked_in_configs/partner_googleadservices_com.json',
+              'domain_reliability/baked_in_configs/pubads_g_doubleclick_net.json',
+              'domain_reliability/baked_in_configs/redirector_googlevideo_com.json',
+              'domain_reliability/baked_in_configs/redirector_gvt1_com.json',
+              'domain_reliability/baked_in_configs/s0_2mdn_net.json',
               'domain_reliability/baked_in_configs/ssl_gstatic_com.json',
+              'domain_reliability/baked_in_configs/t0_gstatic_com.json',
+              'domain_reliability/baked_in_configs/t1_gstatic_com.json',
+              'domain_reliability/baked_in_configs/t2_gstatic_com.json',
+              'domain_reliability/baked_in_configs/t3_gstatic_com.json',
+              'domain_reliability/baked_in_configs/themes_googleusercontent_com.json',
               'domain_reliability/baked_in_configs/www_google_com.json',
+              'domain_reliability/baked_in_configs/www_googleadservices_com.json',
+              'domain_reliability/baked_in_configs/www_gstatic_com.json',
               'domain_reliability/baked_in_configs/www_youtube_com.json',
             ],
           },

components/domain_reliability/bake_in_configs.py

@@ -17,7 +17,10 @@ import sys
 # A whitelist of domains that the script will accept when baking configs in to
 # Chrome, to ensure incorrect ones are not added accidentally. Subdomains of
 # whitelist entries are also allowed (e.g. maps.google.com, ssl.gstatic.com).
-DOMAIN_WHITELIST = ('google.com', 'gstatic.com', 'youtube.com')
+DOMAIN_WHITELIST = ('2mdn.net', 'admob.com', 'doubleclick.net', 'ggpht.com',
+                    'google.com', 'googleadservices.com', 'googleapis.com',
+                    'googlesyndication.com', 'googleusercontent.com',
+                    'googlevideo.com', 'gstatic.com', 'gvt1.com', 'youtube.com')
 
 
 CC_HEADER = """// Copyright (C) 2014 The Chromium Authors. All rights reserved.
@@ -78,23 +81,29 @@ def main():
     return 1
 
   cpp_code = CC_HEADER
+  found_invalid_config = False
   for json_file in sys.argv[1:-1]:
     with open(json_file, 'r') as f:
       json_text = f.read()
     config = json.loads(json_text)
     if 'monitored_domain' not in config:
-      print >> sys.stderr ('%s: no monitored_domain found' % json_file)
-      return 1
+      print >> sys.stderr, ('%s: no monitored_domain found' % json_file)
+      found_invalid_config = True
+      continue
     domain = config['monitored_domain']
     if not domain_is_whitelisted(domain):
-      print >> sys.stderr ('%s: monitored_domain "%s" not in whitelist' %
-                           (json_file, domain))
-      return 1
+      print >> sys.stderr, ('%s: monitored_domain "%s" not in whitelist' %
+                            (json_file, domain))
+      found_invalid_config = True
+      continue
     cpp_code += "  // " + json_file + ":\n"
     cpp_code += quote_and_wrap_text(json_text) + ",\n"
     cpp_code += "\n"
   cpp_code += CC_FOOTER
 
+  if found_invalid_config:
+    return 1
+
   with open(sys.argv[-1], 'wb') as f:
     f.write(cpp_code)
 

components/domain_reliability/baked_in_configs/accounts_google_com.json

+{
+  "config_version": "accounts-google-com-v1",
+  "config_valid_until": 1413331200.0,
+  "monitored_domain": "accounts.google.com",
+  "collectors": [
+    {
+      "upload_url": "https://clients2.google.com/domainreliability/upload"
+    }
+  ],
+  "monitored_resources": [
+    {
+      "resource_name": "accounts-google-com-other",
+      "url_patterns": ["http*://accounts.google.com/*"],
+      "success_sample_rate": 0.05,
+      "failure_sample_rate": 1.00
+    }
+  ]
+}

components/domain_reliability/baked_in_configs/ad_doubleclick_net.json

+{
+  "config_version": "ad-doubleclick-net-v1",
+  "config_valid_until": 1413331200.0,
+  "monitored_domain": "ad.doubleclick.net",
+  "collectors": [
+    {
+      "upload_url": "https://clients2.google.com/domainreliability/upload"
+    }
+  ],
+  "monitored_resources": [
+    {
+      "resource_name": "dblclk",
+      "url_patterns": ["http*://ad.doubleclick.net/*"],
+      "success_sample_rate": 0.05,
+      "failure_sample_rate": 1.00
+    }
+  ]
+}

components/domain_reliability/baked_in_configs/apis_google_com.json

 {
   "config_version": "apis-google-com-v1",
-  "config_valid_until": 1405382400.0,
+  "config_valid_until": 1413331200.0,
   "monitored_domain": "apis.google.com",
   "collectors": [
     {

components/domain_reliability/baked_in_configs/c_admob_com.json

+{
+  "config_version": "c-admob-com-v1",
+  "config_valid_until": 1413331200.0,
+  "monitored_domain": "c.admob.com",
+  "collectors": [
+    {
+      "upload_url": "https://clients2.google.com/domainreliability/upload"
+    }
+  ],
+  "monitored_resources": [
+    {
+      "resource_name": "c-admob-com-other",
+      "url_patterns": ["http*://c.admob.com/*"],
+      "success_sample_rate": 0.05,
+      "failure_sample_rate": 1.00
+    }
+  ]
+}

components/domain_reliability/baked_in_configs/csi_gstatic_com.json

+{
+  "config_version": "csi-gstatic-com-v1",
+  "config_valid_until": 1413331200.0,
+  "monitored_domain": "csi.gstatic.com",
+  "collectors": [
+    {
+      "upload_url": "https://clients2.google.com/domainreliability/upload"
+    }
+  ],
+  "monitored_resources": [
+    {
+      "resource_name": "csi-gstatic-com-other",
+      "url_patterns": ["http*://csi.gstatic.com/*"],
+      "success_sample_rate": 0.05,
+      "failure_sample_rate": 1.00
+    }
+  ]
+}

components/domain_reliability/baked_in_configs/ddm_google_com.json

 {
   "config_version": "ddm-google-com-v1",
-  "config_valid_until": 1405382400.0,
+  "config_valid_until": 1413331200.0,
   "monitored_domain": "ddm.google.com",
   "collectors": [
     {

components/domain_reliability/baked_in_configs/docs_google_com.json

+{
+  "config_version": "docs-google-com-v1",
+  "config_valid_until": 1413331200.0,
+  "monitored_domain": "docs.google.com",
+  "collectors": [
+    {
+      "upload_url": "https://clients2.google.com/domainreliability/upload"
+    }
+  ],
+  "monitored_resources": [
+    {
+      "resource_name": "docs-google-com-docs",
+      "url_patterns": ["http*://docs.google.com/*/document/*"],
+      "success_sample_rate": 0.05,
+      "failure_sample_rate": 1.00
+    },
+    {
+      "resource_name": "docs-google-com-slides",
+      "url_patterns": ["http*://docs.google.com/*/presentation/*"],
+      "success_sample_rate": 0.05,
+      "failure_sample_rate": 1.00
+    },
+    {
+      "resource_name": "docs-google-com-sheets",
+      "url_patterns": ["http*://docs.google.com/*/spreadsheets/*"],
+      "success_sample_rate": 0.05,
+      "failure_sample_rate": 1.00
+    },
+    {
+      "resource_name": "docs-google-com-other",
+      "url_patterns": ["http*://docs.google.com/*"],
+      "success_sample_rate": 0.05,
+      "failure_sample_rate": 1.00
+    }
+  ]
+}

components/domain_reliability/baked_in_configs/drive_google_com.json

 {
   "config_version": "drive-google-com-v1",
-  "config_valid_until": 1405382400.0,
+  "config_valid_until": 1413331200.0,
   "monitored_domain": "drive.google.com",
   "collectors": [
     {

components/domain_reliability/baked_in_configs/e_admob_com.json

+{
+  "config_version": "e-admob-com-v1",
+  "config_valid_until": 1413331200.0,
+  "monitored_domain": "e.admob.com",
+  "collectors": [
+    {
+      "upload_url": "https://clients2.google.com/domainreliability/upload"
+    }
+  ],
+  "monitored_resources": [
+    {
+      "resource_name": "e-admob-com-other",
+      "url_patterns": ["http*://e.admob.com/*"],
+      "success_sample_rate": 0.05,
+      "failure_sample_rate": 1.00
+    }
+  ]
+}

components/domain_reliability/baked_in_configs/fonts_googleapis_com.json

+{
+  "config_version": "fonts-googleapis-com-v1",
+  "config_valid_until": 1413331200.0,
+  "monitored_domain": "fonts.googleapis.com",
+  "collectors": [
+    {
+      "upload_url": "https://clients2.google.com/domainreliability/upload"
+    }
+  ],
+  "monitored_resources": [
+    {
+      "resource_name": "fonts-googleapis-com-other",
+      "url_patterns": ["http*://fonts.googleapis.com/*"],
+      "success_sample_rate": 0.05,
+      "failure_sample_rate": 1.00
+    }
+  ]
+}

components/domain_reliability/baked_in_configs/googleads4_g_doubleclick_net.json

+{
+  "config_version": "googleads4-g-doubleclick-net-v1",
+  "config_valid_until": 1413331200.0,
+  "monitored_domain": "googleads4.g.doubleclick.net",
+  "collectors": [
+    {
+      "upload_url": "https://clients2.google.com/domainreliability/upload"
+    }
+  ],
+  "monitored_resources": [
+    {
+      "resource_name": "googleads4-g-doubleclick-net-other",
+      "url_patterns": ["http*://googleads4.g.doubleclick.net/*"],
+      "success_sample_rate": 0.05,
+      "failure_sample_rate": 1.00
+    }
+  ]
+}

components/domain_reliability/baked_in_configs/googleads_g_doubleclick_net.json

+{
+  "config_version": "googleads-g-doubleclick-net-v1",
+  "config_valid_until": 1413331200.0,
+  "monitored_domain": "googleads.g.doubleclick.net",
+  "collectors": [
+    {
+      "upload_url": "https://clients2.google.com/domainreliability/upload"
+    }
+  ],
+  "monitored_resources": [
+    {
+      "resource_name": "googleads-g-doubleclick-net-other",
+      "url_patterns": ["http*://googleads.g.doubleclick.net/*"],
+      "success_sample_rate": 0.05,
+      "failure_sample_rate": 1.00
+    }
+  ]
+}

components/domain_reliability/baked_in_configs/gstatic_com.json

+{
+  "config_version": "gstatic-com-v1",
+  "config_valid_until": 1413331200.0,
+  "monitored_domain": "gstatic.com",
+  "collectors": [
+    {
+      "upload_url": "https://clients2.google.com/domainreliability/upload"
+    }
+  ],
+  "monitored_resources": [
+    {
+      "resource_name": "gstatic-com-other",
+      "url_patterns": ["http*://gstatic.com/*"],
+      "success_sample_rate": 0.05,
+      "failure_sample_rate": 1.00
+    }
+  ]
+}

components/domain_reliability/baked_in_configs/lh3_ggpht_com.json

+{
+  "config_version": "lh3-ggpht-com-v1",
+  "config_valid_until": 1413331200.0,
+  "monitored_domain": "lh3.ggpht.com",
+  "collectors": [
+    {
+      "upload_url": "https://clients2.google.com/domainreliability/upload"
+    }
+  ],
+  "monitored_resources": [
+    {
+      "resource_name": "lh3-ggpht-com-other",
+      "url_patterns": ["http*://lh3.ggpht.com/*"],
+      "success_sample_rate": 0.05,
+      "failure_sample_rate": 1.00
+    }
+  ]
+}

components/domain_reliability/baked_in_configs/lh4_ggpht_com.json

+{
+  "config_version": "lh4-ggpht-com-v1",
+  "config_valid_until": 1413331200.0,
+  "monitored_domain": "lh4.ggpht.com",
+  "collectors": [
+    {
+      "upload_url": "https://clients2.google.com/domainreliability/upload"
+    }
+  ],
+  "monitored_resources": [
+    {
+      "resource_name": "lh4-ggpht-com-other",
+      "url_patterns": ["http*://lh4.ggpht.com/*"],
+      "success_sample_rate": 0.05,
+      "failure_sample_rate": 1.00
+    }
+  ]
+}

components/domain_reliability/baked_in_configs/lh5_ggpht_com.json

+{
+  "config_version": "lh5-ggpht-com-v1",
+  "config_valid_until": 1413331200.0,
+  "monitored_domain": "lh5.ggpht.com",
+  "collectors": [
+    {
+      "upload_url": "https://clients2.google.com/domainreliability/upload"
+    }
+  ],
+  "monitored_resources": [
+    {
+      "resource_name": "lh5-ggpht-com-other",
+      "url_patterns": ["http*://lh5.ggpht.com/*"],
+      "success_sample_rate": 0.05,
+      "failure_sample_rate": 1.00
+    }
+  ]
+}

components/domain_reliability/baked_in_configs/lh6_ggpht_com.json

+{
+  "config_version": "lh6-ggpht-com-v1",
+  "config_valid_until": 1413331200.0,
+  "monitored_domain": "lh6.ggpht.com",
+  "collectors": [
+    {
+      "upload_url": "https://clients2.google.com/domainreliability/upload"
+    }
+  ],
+  "monitored_resources": [
+    {
+      "resource_name": "lh6-ggpht-com-other",
+      "url_patterns": ["http*://lh6.ggpht.com/*"],
+      "success_sample_rate": 0.05,
+      "failure_sample_rate": 1.00
+    }
+  ]
+}

components/domain_reliability/baked_in_configs/mail_google_com.json

 {
   "config_version": "mail-google-com-v1",
-  "config_valid_until": 1405382400.0,
+  "config_valid_until": 1413331200.0,
   "monitored_domain": "mail.google.com",
   "collectors": [
     {

components/domain_reliability/baked_in_configs/media_admob_com.json

+{
+  "config_version": "media-admob-com-v1",
+  "config_valid_until": 1413331200.0,
+  "monitored_domain": "media.admob.com",
+  "collectors": [
+    {
+      "upload_url": "https://clients2.google.com/domainreliability/upload"
+    }
+  ],
+  "monitored_resources": [
+    {
+      "resource_name": "media-admob-com-other",
+      "url_patterns": ["http*://media.admob.com/*"],
+      "success_sample_rate": 0.05,
+      "failure_sample_rate": 1.00
+    }
+  ]
+}

components/domain_reliability/baked_in_configs/pagead2_googlesyndication_com.json

+{
+  "config_version": "pagead2-googlesyndication-com-v1",
+  "config_valid_until": 1413331200.0,
+  "monitored_domain": "pagead2.googlesyndication.com",
+  "collectors": [
+    {
+      "upload_url": "https://clients2.google.com/domainreliability/upload"
+    }
+  ],
+  "monitored_resources": [
+    {
+      "resource_name": "pagead2-googlesyndication-com-other",
+      "url_patterns": ["http*://pagead2.googlesyndication.com/*"],
+      "success_sample_rate": 0.05,
+      "failure_sample_rate": 1.00
+    }
+  ]
+}

components/domain_reliability/baked_in_configs/partner_googleadservices_com.json

+{
+  "config_version": "partner-googleadservices-com-v1",
+  "config_valid_until": 1413331200.0,
+  "monitored_domain": "partner.googleadservices.com",
+  "collectors": [
+    {
+      "upload_url": "https://clients2.google.com/domainreliability/upload"
+    }
+  ],
+  "monitored_resources": [
+    {
+      "resource_name": "partner-googleadservices-com-other",
+      "url_patterns": ["http*://partner.googleadservices.com/*"],
+      "success_sample_rate": 0.05,
+      "failure_sample_rate": 1.00
+    }
+  ]
+}

components/domain_reliability/baked_in_configs/pubads_g_doubleclick_net.json

+{
+  "config_version": "pubads-g-doubleclick-net-v1",
+  "config_valid_until": 1413331200.0,
+  "monitored_domain": "pubads.g.doubleclick.net",
+  "collectors": [
+    {
+      "upload_url": "https://clients2.google.com/domainreliability/upload"
+    }
+  ],
+  "monitored_resources": [
+    {
+      "resource_name": "pubads-g-doubleclick-net-other",
+      "url_patterns": ["http*://pubads.g.doubleclick.net/*"],
+      "success_sample_rate": 0.05,
+      "failure_sample_rate": 1.00
+    }
+  ]
+}

components/domain_reliability/baked_in_configs/redirector_googlevideo_com.json

+{
+  "config_version": "redirector-googlevideo-com-v1",
+  "config_valid_until": 1413331200.0,
+  "monitored_domain": "redirector.googlevideo.com",
+  "collectors": [
+    {
+      "upload_url": "https://clients2.google.com/domainreliability/upload"
+    }
+  ],
+  "monitored_resources": [
+    {
+      "resource_name": "redirector-googlevideo-com-other",
+      "url_patterns": ["http*://redirector.googlevideo.com/*"],
+      "success_sample_rate": 0.05,
+      "failure_sample_rate": 1.00
+    }
+  ]
+}

components/domain_reliability/baked_in_configs/redirector_gvt1_com.json

+{
+  "config_version": "redirector-gvt1-com-v1",
+  "config_valid_until": 1413331200.0,
+  "monitored_domain": "redirector.gvt1.com",
+  "collectors": [
+    {
+      "upload_url": "https://clients2.google.com/domainreliability/upload"
+    }
+  ],
+  "monitored_resources": [
+    {
+      "resource_name": "redirector-gvt1-com-other",
+      "url_patterns": ["http*://redirector.gvt1.com/*"],
+      "success_sample_rate": 0.05,
+      "failure_sample_rate": 1.00
+    }
+  ]
+}

components/domain_reliability/baked_in_configs/s0_2mdn_net.json

+{
+  "config_version": "s0-2mdn-net-v1",
+  "config_valid_until": 1413331200.0,
+  "monitored_domain": "s0.2mdn.net",
+  "collectors": [
+    {
+      "upload_url": "https://clients2.google.com/domainreliability/upload"
+    }
+  ],
+  "monitored_resources": [
+    {
+      "resource_name": "s0-2mdn-net-other",
+      "url_patterns": ["http*://s0.2mdn.net/*"],
+      "success_sample_rate": 0.05,
+      "failure_sample_rate": 1.00
+    }
+  ]
+}

components/domain_reliability/baked_in_configs/ssl_gstatic_com.json

 {
   "config_version": "ssl-gstatic-com-v1",
-  "config_valid_until": 1405382400.0,
+  "config_valid_until": 1413331200.0,
   "monitored_domain": "ssl.gstatic.com",
   "collectors": [
     {

components/domain_reliability/baked_in_configs/t0_gstatic_com.json

+{
+  "config_version": "t0-gstatic-com-v1",
+  "config_valid_until": 1413331200.0,
+  "monitored_domain": "t0.gstatic.com",
+  "collectors": [
+    {
+      "upload_url": "https://clients2.google.com/domainreliability/upload"
+    }
+  ],
+  "monitored_resources": [
+    {
+      "resource_name": "t0-gstatic-com-other",
+      "url_patterns": ["http*://t0.gstatic.com/*"],
+      "success_sample_rate": 0.05,
+      "failure_sample_rate": 1.00
+    }
+  ]
+}

components/domain_reliability/baked_in_configs/t1_gstatic_com.json

+{
+  "config_version": "t1-gstatic-com-v1",
+  "config_valid_until": 1413331200.0,
+  "monitored_domain": "t1.gstatic.com",
+  "collectors": [
+    {
+      "upload_url": "https://clients2.google.com/domainreliability/upload"
+    }
+  ],
+  "monitored_resources": [
+    {
+      "resource_name": "t1-gstatic-com-other",
+      "url_patterns": ["http*://t1.gstatic.com/*"],
+      "success_sample_rate": 0.05,
+      "failure_sample_rate": 1.00
+    }
+  ]
+}

components/domain_reliability/baked_in_configs/t2_gstatic_com.json

+{
+  "config_version": "t2-gstatic-com-v1",
+  "config_valid_until": 1413331200.0,
+  "monitored_domain": "t2.gstatic.com",
+  "collectors": [
+    {
+      "upload_url": "https://clients2.google.com/domainreliability/upload"
+    }
+  ],
+  "monitored_resources": [
+    {
+      "resource_name": "t2-gstatic-com-other",
+      "url_patterns": ["http*://t2.gstatic.com/*"],
+      "success_sample_rate": 0.05,
+      "failure_sample_rate": 1.00
+    }
+  ]
+}

components/domain_reliability/baked_in_configs/t3_gstatic_com.json

+{
+  "config_version": "t3-gstatic-com-v1",
+  "config_valid_until": 1413331200.0,
+  "monitored_domain": "t3.gstatic.com",
+  "collectors": [
+    {
+      "upload_url": "https://clients2.google.com/domainreliability/upload"
+    }
+  ],
+  "monitored_resources": [
+    {
+      "resource_name": "t3-gstatic-com-other",
+      "url_patterns": ["http*://t3.gstatic.com/*"],
+      "success_sample_rate": 0.05,
+      "failure_sample_rate": 1.00
+    }
+  ]
+}

components/domain_reliability/baked_in_configs/themes_googleusercontent_com.json

+{
+  "config_version": "themes-googleusercontent-com-v1",
+  "config_valid_until": 1413331200.0,
+  "monitored_domain": "themes.googleusercontent.com",
+  "collectors": [
+    {
+      "upload_url": "https://clients2.google.com/domainreliability/upload"
+    }
+  ],
+  "monitored_resources": [
+    {
+      "resource_name": "themes-googleusercontent-com-other",
+      "url_patterns": ["http*://themes.googleusercontent.com/*"],
+      "success_sample_rate": 0.05,
+      "failure_sample_rate": 1.00
+    }
+  ]
+}

components/domain_reliability/baked_in_configs/www_google_com.json

 {
   "config_version": "www-google-com-v1",
-  "config_valid_until": 1405382400.0,
+  "config_valid_until": 1413331200.0,
   "monitored_domain": "www.google.com",
   "collectors": [
     {
@@ -9,31 +9,61 @@
   ],
   "monitored_resources": [
     {
-      "resource_name": "search",
+      "resource_name": "www-google-com-search",
       "url_patterns": ["http*://www.google.com/search?*"],
       "success_sample_rate": 0.05,
       "failure_sample_rate": 1.00
     },
     {
-      "resource_name": "maps",
+      "resource_name": "www-google-com-maps",
       "url_patterns": ["http*://www.google.com/maps/*"],
       "success_sample_rate": 0.05,
       "failure_sample_rate": 1.00
     },
     {
-      "resource_name": "calendar",
+      "resource_name": "www-google-com-calendar",
       "url_patterns": ["http*://www.google.com/calendar/*"],
       "success_sample_rate": 0.05,
       "failure_sample_rate": 1.00
     },
     {
-      "resource_name": "home",
+      "resource_name": "www-google-com-images",
+      "url_patterns": ["http*://www.google.com/images/*"],
+      "success_sample_rate": 0.05,
+      "failure_sample_rate": 1.00
+    },
+    {
+      "resource_name": "www-google-com-adwords",
+      "url_patterns": ["http*://www.google.com/adwords/*"],
+      "success_sample_rate": 0.05,
+      "failure_sample_rate": 1.00
+    },
+    {
+      "resource_name": "www-google-com-adsense",
+      "url_patterns": ["http*://www.google.com/adsense/*"],
+      "success_sample_rate": 0.05,
+      "failure_sample_rate": 1.00
+    },
+    {
+      "resource_name": "www-google-com-ads",
+      "url_patterns": ["http*://www.google.com/ads/*"],
+      "success_sample_rate": 0.05,
+      "failure_sample_rate": 1.00
+    },
+    {
+      "resource_name": "www-google-com-business",
+      "url_patterns": ["http*://www.google.com/business/*"],
+      "success_sample_rate": 0.05,
+      "failure_sample_rate": 1.00
+    },
+    {
+      "resource_name": "www-google-com-home",
       "url_patterns": ["http*://www.google.com/"],
       "success_sample_rate": 0.05,
       "failure_sample_rate": 1.00
     },
     {
-      "resource_name": "other",
+      "resource_name": "www-google-com-other",
       "url_patterns": ["http*://www.google.com/*"],
       "success_sample_rate": 0.05,
       "failure_sample_rate": 1.00

components/domain_reliability/baked_in_configs/www_googleadservices_com.json

+{
+  "config_version": "www-googleadservices-com-v1",
+  "config_valid_until": 1413331200.0,
+  "monitored_domain": "www.googleadservices.com",
+  "collectors": [
+    {
+      "upload_url": "https://clients2.google.com/domainreliability/upload"
+    }
+  ],
+  "monitored_resources": [
+    {
+      "resource_name": "www-googleadservices-com-other",
+      "url_patterns": ["http*://www.googleadservices.com/*"],
+      "success_sample_rate": 0.05,
+      "failure_sample_rate": 1.00
+    }
+  ]
+}

components/domain_reliability/baked_in_configs/www_gstatic_com.json

+{
+  "config_version": "www-gstatic-com-v1",
+  "config_valid_until": 1413331200.0,
+  "monitored_domain": "www.gstatic.com",
+  "collectors": [
+    {
+      "upload_url": "https://clients2.google.com/domainreliability/upload"
+    }
+  ],
+  "monitored_resources": [
+    {
+      "resource_name": "www-gstatic-com-other",
+      "url_patterns": ["http*://www.gstatic.com/*"],
+      "success_sample_rate": 0.05,
+      "failure_sample_rate": 1.00
+    }
+  ]
+}

components/domain_reliability/baked_in_configs/www_youtube_com.json

 {
   "config_version": "www-youtube-com-v1",
-  "config_valid_until": 1405382400.0,
+  "config_valid_until": 1413331200.0,
   "monitored_domain": "www.youtube.com",
   "collectors": [
     {

components/domain_reliability/monitor_unittest.cc

@@ -236,8 +236,9 @@ TEST_F(DomainReliabilityMonitorTest, WasFetchedViaProxy) {
   EXPECT_TRUE(beacons[0].server_ip.empty());
 }
 
-// Disabled; does not handle when baked in configs expire.
-TEST_F(DomainReliabilityMonitorTest, DISABLED_AddBakedInConfigs) {
+// Will fail when baked-in configs expire, as a reminder to update them.
+// (Contact ttuttle@chromium.org if this starts failing.)
+TEST_F(DomainReliabilityMonitorTest, AddBakedInConfigs) {
   // AddBakedInConfigs DCHECKs that the baked-in configs parse correctly, so
   // this unittest will fail if someone tries to add an invalid config to the
   // source tree.