Add UNSCHEDULED_loading.mbi benchmark

This CL adds a loading telemetry benchmark that measures performance of
agents heavy web-sites, which the MBI team currently targets optimization.
The added benchmark is for an internal team use, and not yet scheduled on
the perf waterfall (thus UNSCHEDULED_ prefix).

Bug: 1051790
Change-Id: I96b9305bc8200153fa8587de338824d56bc47459
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2576056Reviewed-by: Kunihiko Sakamoto <ksakamoto@chromium.org>
Commit-Queue: Kouhei Ueno <kouhei@chromium.org>
Cr-Commit-Position: refs/heads/master@{#834530}

tools/perf/benchmark.csv

@@ -3,6 +3,7 @@ See the following link for directions for making changes to this data:,https://b
 Googlers can view additional information about internal perf infrastructure at,https://goto.google.com/chrome-benchmarking-sheet
 Benchmark name,Individual owners,Component,Documentation,Tags
 UNSCHEDULED_blink_perf.service_worker,"shimazu@chromium.org, falken@chromium.org, ting.shao@intel.com",Blink>ServiceWorker,https://bit.ly/blink-perf-benchmarks,
+UNSCHEDULED_loading.mbi,blink-isolation-dev@chromium.org,Blink>Internals>Modularization,https://bit.ly/loading-benchmarks,many_agents
 base_perftests,"skyostil@chromium.org, gab@chromium.org",Internals>SequenceManager,https://chromium.googlesource.com/chromium/src/+/HEAD/base/README.md#performance-testing,
 blink_perf.accessibility,dmazzoni@chromium.org,Blink>Accessibility,https://bit.ly/blink-perf-benchmarks,all
 blink_perf.bindings,"jbroman@chromium.org, yukishiino@chromium.org, haraken@chromium.org",Blink>Bindings,https://bit.ly/blink-perf-benchmarks,all

tools/perf/benchmarks/loading.py

@@ -79,3 +79,27 @@ class LoadingMobile(_LoadingBase):
   @classmethod
   def Name(cls):
     return 'loading.mobile'
+
+
+@benchmark.Info(emails=['blink-isolation-dev@chromium.org'],
+                component='Blink>Internals>Modularization',
+                documentation_url='https://bit.ly/loading-benchmarks')
+class LoadingMBI(_LoadingBase):
+  """ A benchmark measuring loading performance of the sites the MBI team cares
+  about. """
+  # TODO(rmhasan): Remove the SUPPORTED_PLATFORMS lists.
+  # SUPPORTED_PLATFORMS is deprecated, please put system specifier tags
+  # from expectations.config in SUPPORTED_PLATFORM_TAGS.
+  SUPPORTED_PLATFORM_TAGS = [platforms.MOBILE]
+  SUPPORTED_PLATFORMS = [story.expectations.ALL_MOBILE]
+
+  def CreateStorySet(self, options):
+    return page_sets.LoadingMobileStorySet(
+        cache_temperatures=[cache_temperature.ANY],
+        cache_temperatures_for_pwa=[],
+        traffic_settings=[traffic_setting.NONE, traffic_setting.REGULAR_3G],
+        include_tags=['many_agents'])
+
+  @classmethod
+  def Name(cls):
+    return 'UNSCHEDULED_loading.mbi'

tools/perf/page_sets/data/loading_mobile.json

@@ -2,302 +2,398 @@
     "archives": {
         "58Pic": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "58Pic_3g": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "Amazon": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
+        "AmazonJP": {
+            "DEFAULT": "loading_mobile_5e1b45320b.wprgo"
+        },
+        "AmazonJP_3g": {
+            "DEFAULT": "loading_mobile_5e1b45320b.wprgo"
+        },
         "Amazon_3g": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
+        "BBC": {
+            "DEFAULT": "loading_mobile_5e1b45320b.wprgo"
+        },
+        "BBC_3g": {
+            "DEFAULT": "loading_mobile_5e1b45320b.wprgo"
+        },
         "BOLNoticias": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "BOLNoticias_3g": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "Baidu": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "Baidu_3g": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "Bradesco": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "Bradesco_3g": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
+        "CNN": {
+            "DEFAULT": "loading_mobile_5e1b45320b.wprgo"
+        },
+        "CNN_3g": {
+            "DEFAULT": "loading_mobile_5e1b45320b.wprgo"
+        },
+        "CNet": {
+            "DEFAULT": "loading_mobile_5e1b45320b.wprgo"
+        },
+        "CNet_3g": {
+            "DEFAULT": "loading_mobile_5e1b45320b.wprgo"
+        },
+        "Cricbuzz": {
+            "DEFAULT": "loading_mobile_5e1b45320b.wprgo"
+        },
+        "Cricbuzz_3g": {
+            "DEFAULT": "loading_mobile_5e1b45320b.wprgo"
+        },
         "Dailymotion": {
             "DEFAULT": "loading_mobile_001.wprgo"
-        }, 
+        },
         "Dailymotion_3g": {
             "DEFAULT": "loading_mobile_001.wprgo"
-        }, 
+        },
         "Dawn": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "Dawn_3g": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "DevOpera": {
             "DEFAULT": "loading_mobile_003.wprgo"
-        }, 
+        },
         "DevOpera_cold": {
             "DEFAULT": "loading_mobile_003.wprgo"
-        }, 
+        },
         "DevOpera_cold_3g": {
             "DEFAULT": "loading_mobile_003.wprgo"
-        }, 
+        },
         "DevOpera_hot": {
             "DEFAULT": "loading_mobile_003.wprgo"
-        }, 
+        },
         "DevOpera_hot_3g": {
             "DEFAULT": "loading_mobile_003.wprgo"
-        }, 
+        },
         "DevOpera_warm": {
             "DEFAULT": "loading_mobile_003.wprgo"
-        }, 
+        },
         "DevOpera_warm_3g": {
             "DEFAULT": "loading_mobile_003.wprgo"
-        }, 
+        },
         "Dramaq": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "Dramaq_3g": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
+        "ESPN": {
+            "DEFAULT": "loading_mobile_5e1b45320b.wprgo"
+        },
+        "ESPN_3g": {
+            "DEFAULT": "loading_mobile_5e1b45320b.wprgo"
+        },
+        "Ebay": {
+            "DEFAULT": "loading_mobile_5e1b45320b.wprgo"
+        },
+        "Ebay_3g": {
+            "DEFAULT": "loading_mobile_5e1b45320b.wprgo"
+        },
         "EnquiryIndianRail": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "EnquiryIndianRail_3g": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "Facebook": {
             "DEFAULT": "loading_mobile_002.wprgo"
-        }, 
+        },
         "Facebook_3g": {
             "DEFAULT": "loading_mobile_002.wprgo"
-        }, 
+        },
         "FlipBoard": {
             "DEFAULT": "loading_mobile_003.wprgo"
-        }, 
+        },
         "FlipBoard_cold": {
             "DEFAULT": "loading_mobile_003.wprgo"
-        }, 
+        },
         "FlipBoard_cold_3g": {
             "DEFAULT": "loading_mobile_003.wprgo"
-        }, 
+        },
         "FlipBoard_hot": {
             "DEFAULT": "loading_mobile_003.wprgo"
-        }, 
+        },
         "FlipBoard_hot_3g": {
             "DEFAULT": "loading_mobile_003.wprgo"
-        }, 
+        },
         "FlipBoard_warm": {
             "DEFAULT": "loading_mobile_003.wprgo"
-        }, 
+        },
         "FlipBoard_warm_3g": {
             "DEFAULT": "loading_mobile_003.wprgo"
-        }, 
+        },
         "FlipKart": {
             "DEFAULT": "loading_mobile_003.wprgo"
-        }, 
+        },
         "FlipKart_cold": {
             "DEFAULT": "loading_mobile_003.wprgo"
-        }, 
+        },
         "FlipKart_cold_3g": {
             "DEFAULT": "loading_mobile_003.wprgo"
-        }, 
+        },
         "FlipKart_hot": {
             "DEFAULT": "loading_mobile_003.wprgo"
-        }, 
+        },
         "FlipKart_hot_3g": {
             "DEFAULT": "loading_mobile_003.wprgo"
-        }, 
+        },
         "FlipKart_warm": {
             "DEFAULT": "loading_mobile_003.wprgo"
-        }, 
+        },
         "FlipKart_warm_3g": {
             "DEFAULT": "loading_mobile_003.wprgo"
-        }, 
+        },
         "FranceTVInfo": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "FranceTVInfo_3g": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "G1": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "G1_3g": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "GSShop": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "GSShop_3g": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "GoogleBrazil": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "GoogleBrazil_3g": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "GoogleIndia": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "GoogleIndia_3g": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "GoogleIndonesia": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "GoogleIndonesia_3g": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "GoogleRedirectToGoogleJapan": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "GoogleRedirectToGoogleJapan_3g": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "Hongkiat": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "Hongkiat_3g": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
+        "IMDB": {
+            "DEFAULT": "loading_mobile_5e1b45320b.wprgo"
+        },
+        "IMDB_3g": {
+            "DEFAULT": "loading_mobile_5e1b45320b.wprgo"
+        },
+        "IndiaTimes": {
+            "DEFAULT": "loading_mobile_5e1b45320b.wprgo"
+        },
+        "IndiaTimes_3g": {
+            "DEFAULT": "loading_mobile_5e1b45320b.wprgo"
+        },
         "KapanLagi": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "KapanLagi_3g": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "Kaskus": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "Kaskus_3g": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "LocalMoxie": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "LocalMoxie_3g": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "Locanto": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "Locanto_3g": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
+        "MSN": {
+            "DEFAULT": "loading_mobile_5e1b45320b.wprgo"
+        },
+        "MSN_3g": {
+            "DEFAULT": "loading_mobile_5e1b45320b.wprgo"
+        },
+        "Netflix": {
+            "DEFAULT": "loading_mobile_5e1b45320b.wprgo"
+        },
+        "Netflix_3g": {
+            "DEFAULT": "loading_mobile_5e1b45320b.wprgo"
+        },
+        "Nicovideo": {
+            "DEFAULT": "loading_mobile_5e1b45320b.wprgo"
+        },
+        "Nicovideo_3g": {
+            "DEFAULT": "loading_mobile_5e1b45320b.wprgo"
+        },
+        "NyTimes": {
+            "DEFAULT": "loading_mobile_5e1b45320b.wprgo"
+        },
+        "NyTimes_3g": {
+            "DEFAULT": "loading_mobile_5e1b45320b.wprgo"
+        },
         "OLX": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "OLX_3g": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "QQNews": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "QQNews_3g": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
+        "Sina": {
+            "DEFAULT": "loading_mobile_5e1b45320b.wprgo"
+        },
+        "Sina_3g": {
+            "DEFAULT": "loading_mobile_5e1b45320b.wprgo"
+        },
+        "SindoNews": {
+            "DEFAULT": "loading_mobile_5e1b45320b.wprgo"
+        },
+        "SindoNews_3g": {
+            "DEFAULT": "loading_mobile_5e1b45320b.wprgo"
+        },
         "SlideShare": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "SlideShare_3g": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "Suumo": {
             "DEFAULT": "loading_mobile_003.wprgo"
-        }, 
+        },
         "Suumo_cold": {
             "DEFAULT": "loading_mobile_003.wprgo"
-        }, 
+        },
         "Suumo_cold_3g": {
             "DEFAULT": "loading_mobile_003.wprgo"
-        }, 
+        },
         "Suumo_hot": {
             "DEFAULT": "loading_mobile_003.wprgo"
-        }, 
+        },
         "Suumo_hot_3g": {
             "DEFAULT": "loading_mobile_003.wprgo"
-        }, 
+        },
         "Suumo_warm": {
             "DEFAULT": "loading_mobile_003.wprgo"
-        }, 
+        },
         "Suumo_warm_3g": {
             "DEFAULT": "loading_mobile_003.wprgo"
-        }, 
+        },
         "Thairath": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "Thairath_3g": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
+        "TheGuardian": {
+            "DEFAULT": "loading_mobile_5e1b45320b.wprgo"
+        },
+        "TheGuardian_3g": {
+            "DEFAULT": "loading_mobile_5e1b45320b.wprgo"
+        },
         "TheStar": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "TheStar_3g": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "TribunNews": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "TribunNews_3g": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "Twitter": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "Twitter_3g": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "VoiceMemos": {
             "DEFAULT": "loading_mobile_003.wprgo"
-        }, 
+        },
         "VoiceMemos_cold": {
             "DEFAULT": "loading_mobile_003.wprgo"
-        }, 
+        },
         "VoiceMemos_cold_3g": {
             "DEFAULT": "loading_mobile_003.wprgo"
-        }, 
+        },
         "VoiceMemos_hot": {
             "DEFAULT": "loading_mobile_003.wprgo"
-        }, 
+        },
         "VoiceMemos_hot_3g": {
             "DEFAULT": "loading_mobile_003.wprgo"
-        }, 
+        },
         "VoiceMemos_warm": {
             "DEFAULT": "loading_mobile_003.wprgo"
-        }, 
+        },
         "VoiceMemos_warm_3g": {
             "DEFAULT": "loading_mobile_003.wprgo"
-        }, 
+        },
         "Wikipedia": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "Wikipedia_3g": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "YahooNews": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "YahooNews_3g": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "Youtube": {
             "DEFAULT": "loading_mobile_000.wprgo"
-        }, 
+        },
         "Youtube_3g": {
             "DEFAULT": "loading_mobile_000.wprgo"
         }
-    }, 
-    "description": "Describes the Web Page Replay archives for a story set. Don't edit by hand! Use record_wpr for updating.", 
+    },
+    "description": "Describes the Web Page Replay archives for a story set. Don't edit by hand! Use record_wpr for updating.",
     "platform_specific": true
 }
\ No newline at end of file

tools/perf/page_sets/data/loading_mobile_5e1b45320b.wprgo.sha1

+5e1b45320b4c2b1f798c1ba885128dd407dcccf1
\ No newline at end of file

tools/perf/page_sets/loading_mobile.py

@@ -34,12 +34,18 @@ class LoadingMobileStorySet(story.StorySet):
   Design doc: https://docs.google.com/document/d/1QKlZIoURAxZk-brrXsKYZl9O8ieqXht3ogeF9yLNFCI/edit
   """
 
-  def __init__(self, cache_temperatures=None, cache_temperatures_for_pwa=None,
-               traffic_settings=None):
+  def __init__(self,
+               cache_temperatures=None,
+               cache_temperatures_for_pwa=None,
+               traffic_settings=None,
+               include_tags=None):
     super(LoadingMobileStorySet, self).__init__(
         archive_data_file='data/loading_mobile.json',
         cloud_storage_bucket=story.PARTNER_BUCKET)
 
+    if include_tags is None:
+      include_tags = ['*']
+
     if cache_temperatures is None:
       cache_temperatures = [cache_temperature_module.ANY]
 
@@ -49,99 +55,127 @@ class LoadingMobileStorySet(story.StorySet):
     if traffic_settings is None:
       traffic_settings = [traffic_setting_module.NONE]
 
-    self.AddStories(['global'], [
-      ('https://www.google.com/search?q=flower#q=flower+delivery',
-       'GoogleRedirectToGoogleJapan'),
-      ('https://www.youtube.com/watch?v=MU3YuvNRhVY', 'Youtube'),
-      # pylint: disable=line-too-long
-      ('https://www.google.co.in/search?q=%E0%A4%AB%E0%A5%82%E0%A4%B2&rct=j#q=%E0%A4%AB%E0%A5%82%E0%A4%B2+%E0%A4%B5%E0%A4%BF%E0%A4%A4%E0%A4%B0%E0%A4%A3',
-       'GoogleIndia'),
-      ('https://www.google.com.br/search?q=flor#q=Entrega+de+flores&start=10',
-       'GoogleBrazil'),
-      ('https://www.google.co.id/#q=pengiriman+bunga', 'GoogleIndonesia'),
-      ('https://m.facebook.com/?soft=messages', 'Facebook'),
-      # pylint: disable=line-too-long
-      ('http://g1.globo.com/politica/noticia/2016/02/maioria-do-stf-autoriza-fisco-obter-dados-bancarios-sem-decisao-judicial.html',
-       'G1'),
-      # pylint: disable=line-too-long
-      ('https://m.baidu.com/s?word=%E9%B2%9C%E8%8A%B1%E9%80%9F%E9%80%92&oq=%E9%B2%9C%E8%8A%B1',
-       'Baidu'),
-      # pylint: disable=line-too-long
-      ('http://news.yahoo.com/were-top-10-most-visited-us-national-parks-105323727.html',
-       'YahooNews'),
-      ('https://en.m.wikipedia.org/wiki/Solo_Foods', 'Wikipedia'),
-      # pylint: disable=line-too-long
-      ('http://noticias.bol.uol.com.br/ultimas-noticias/brasil/2016/08/03/tufao-nida-nao-deixa-vitimas-mas-prejuizos-de-us-43-milhoes.htm',
-       'BOLNoticias'),
-      ('http://www.amazon.com/gp/aw/s/ref=is_s/189-8585431-1246432?k=shoes',
-       'Amazon'),
-      # pylint: disable=line-too-long
-      ('http://m.tribunnews.com/superskor/2016/08/03/ribuan-polisi-dikerahkan-mengawal-bonek',
-       'TribunNews'),
-      ('http://xw.qq.com/news/20160803025029/NEW2016080302502901', 'QQNews'),
-      # pylint: disable=line-too-long
-      ('http://m.kaskus.co.id/thread/57a03a3214088d91068b4567/inilah-akibat-bersikap-overprotektif-terhadap-anak/?ref=homelanding&med=hot_thread',
-       'Kaskus'),
-      ('http://www.dailymotion.com/video/x3d1kj5_fallout-4-review_videogames',
-       'Dailymotion'),
-      ('https://mobile.twitter.com/scottjehl/status/760618697727803394',
-       'Twitter'),
-      ('http://m.kapanlagi.com/lirik/artis/anji/kata_siapa/',
-       'KapanLagi'),
-      # pylint: disable=line-too-long
-      ('http://olx.co.id/iklan/iphone-6s-64-rose-gold-warna-favorite-IDiSdm5.html#5310a118c3;promoted',
-       'OLX'),
-      # pylint: disable=line-too-long
-      ('http://enquiry.indianrail.gov.in/mntes/MntesServlet?action=MainMenu&subAction=excep&excpType=EC',
-       'EnquiryIndianRail'),
-      # TODO(rnephew): Rerecord this. crbug.com/728882
-      # pylint: disable=line-too-long
-      # ('https://googleblog.blogspot.jp/2016/02/building-safer-web-for-everyone.html',
-      #  'Blogspot'),
-      # pylint: disable=line-too-long
-      # ('http://m.detik.com/finance/read/2016/02/19/151843/3146351/1034/ekspor-tambang-mentah-mau-dibuka-lagi-kalau-sudah-bangun-smelter-bagaimana',
-      #  'Detik'),
-    ], cache_temperatures, traffic_settings)
-
-    self.AddStories(['pwa'], [
-      # pylint: disable=line-too-long
-      ('https://www.flipkart.com/big-wing-casuals/p/itmemeageyfn6m9z?lid=LSTSHOEMEAGURG2PHPW18FTBN&pid=SHOEMEAGURG2PHPW',
-       'FlipKart'),
-      ('https://smp.suumo.jp/mansion/tokyo/sc_104/cond/?moreCond=1',
-       'Suumo'),
-      ('https://voice-memos.appspot.com', 'VoiceMemos'),
-      ('https://dev.opera.com/', 'DevOpera'),
-      ('https://flipboard.com/topic/yoga', 'FlipBoard'),
-      # TODO(rnephew): Record these. crbug.com/728882
-      # ('https://wiki-offline.jakearchibald.com/',
-      #  'WikiOffline'),
-      # ('https://busrouter.sg', 'BusRouter'),
-      # ('https://airhorner.com', 'AirHorner'),
-    ], cache_temperatures_for_pwa, traffic_settings)
-
-    self.AddStories(['tough_ttfmp'], [
-      ('http://www.localmoxie.com', 'LocalMoxie'),
-      ('http://www.dawn.com', 'Dawn'),
-      ('http://www.thairath.co.th', 'Thairath'),
-    ], cache_temperatures, traffic_settings)
-
-    self.AddStories(['easy_ttfmp'], [
-      ('http://www.slideshare.net', 'SlideShare'),
-      ('http://www.bradesco.com.br', 'Bradesco'),
-      ('http://www.gsshop.com', 'GSShop'),
-    ], cache_temperatures, traffic_settings)
-
-    self.AddStories(['tough_tti'], [
-      ('http://www.thestar.com.my', 'TheStar'),
-      ('http://www.58pic.com', '58Pic'),
-      ('http://www.hongkiat.com', 'Hongkiat'),
-    ], cache_temperatures, traffic_settings)
-
-    self.AddStories(['easy_tti'], [
-      ('http://www.dramaq.com.tw', 'Dramaq'),
-      ('http://www.locanto.in', 'Locanto'),
-      ('http://www.francetvinfo.fr', 'FranceTVInfo'),
-    ], cache_temperatures, traffic_settings)
+    if '*' in include_tags or 'global' in include_tags:
+      self.AddStories(['global'], [
+          ('https://www.google.com/search?q=flower#q=flower+delivery',
+           'GoogleRedirectToGoogleJapan'),
+          ('https://www.youtube.com/watch?v=MU3YuvNRhVY', 'Youtube'),
+          # pylint: disable=line-too-long
+          ('https://www.google.co.in/search?q=%E0%A4%AB%E0%A5%82%E0%A4%B2&rct=j#q=%E0%A4%AB%E0%A5%82%E0%A4%B2+%E0%A4%B5%E0%A4%BF%E0%A4%A4%E0%A4%B0%E0%A4%A3',
+           'GoogleIndia'),
+          ('https://www.google.com.br/search?q=flor#q=Entrega+de+flores&start=10',
+           'GoogleBrazil'),
+          ('https://www.google.co.id/#q=pengiriman+bunga', 'GoogleIndonesia'),
+          ('https://m.facebook.com/?soft=messages', 'Facebook'),
+          # pylint: disable=line-too-long
+          ('http://g1.globo.com/politica/noticia/2016/02/maioria-do-stf-autoriza-fisco-obter-dados-bancarios-sem-decisao-judicial.html',
+           'G1'),
+          # pylint: disable=line-too-long
+          ('https://m.baidu.com/s?word=%E9%B2%9C%E8%8A%B1%E9%80%9F%E9%80%92&oq=%E9%B2%9C%E8%8A%B1',
+           'Baidu'),
+          # pylint: disable=line-too-long
+          ('http://news.yahoo.com/were-top-10-most-visited-us-national-parks-105323727.html',
+           'YahooNews'),
+          ('https://en.m.wikipedia.org/wiki/Solo_Foods', 'Wikipedia'),
+          # pylint: disable=line-too-long
+          ('http://noticias.bol.uol.com.br/ultimas-noticias/brasil/2016/08/03/tufao-nida-nao-deixa-vitimas-mas-prejuizos-de-us-43-milhoes.htm',
+           'BOLNoticias'),
+          ('http://www.amazon.com/gp/aw/s/ref=is_s/189-8585431-1246432?k=shoes',
+           'Amazon'),
+          # pylint: disable=line-too-long
+          ('http://m.tribunnews.com/superskor/2016/08/03/ribuan-polisi-dikerahkan-mengawal-bonek',
+           'TribunNews'),
+          ('http://xw.qq.com/news/20160803025029/NEW2016080302502901', 'QQNews'),
+          # pylint: disable=line-too-long
+          ('http://m.kaskus.co.id/thread/57a03a3214088d91068b4567/inilah-akibat-bersikap-overprotektif-terhadap-anak/?ref=homelanding&med=hot_thread',
+           'Kaskus'),
+          ('http://www.dailymotion.com/video/x3d1kj5_fallout-4-review_videogames',
+           'Dailymotion'),
+          ('https://mobile.twitter.com/scottjehl/status/760618697727803394',
+           'Twitter'),
+          ('http://m.kapanlagi.com/lirik/artis/anji/kata_siapa/',
+           'KapanLagi'),
+          # pylint: disable=line-too-long
+          ('http://olx.co.id/iklan/iphone-6s-64-rose-gold-warna-favorite-IDiSdm5.html#5310a118c3;promoted',
+           'OLX'),
+          # pylint: disable=line-too-long
+          ('http://enquiry.indianrail.gov.in/mntes/MntesServlet?action=MainMenu&subAction=excep&excpType=EC',
+           'EnquiryIndianRail'),
+          # TODO(rnephew): Rerecord this. crbug.com/728882
+          # pylint: disable=line-too-long
+          # ('https://googleblog.blogspot.jp/2016/02/building-safer-web-for-everyone.html',
+          #  'Blogspot'),
+          # pylint: disable=line-too-long
+          # ('http://m.detik.com/finance/read/2016/02/19/151843/3146351/1034/ekspor-tambang-mentah-mau-dibuka-lagi-kalau-sudah-bangun-smelter-bagaimana',
+          #  'Detik'),
+      ], cache_temperatures, traffic_settings)
+
+    if '*' in include_tags or 'pwa' in include_tags:
+      self.AddStories(['pwa'], [
+          # pylint: disable=line-too-long
+          ('https://www.flipkart.com/big-wing-casuals/p/itmemeageyfn6m9z?lid=LSTSHOEMEAGURG2PHPW18FTBN&pid=SHOEMEAGURG2PHPW',
+           'FlipKart'),
+          ('https://smp.suumo.jp/mansion/tokyo/sc_104/cond/?moreCond=1',
+           'Suumo'),
+          ('https://voice-memos.appspot.com', 'VoiceMemos'),
+          ('https://dev.opera.com/', 'DevOpera'),
+          ('https://flipboard.com/topic/yoga', 'FlipBoard'),
+          # TODO(rnephew): Record these. crbug.com/728882
+          # ('https://wiki-offline.jakearchibald.com/',
+          #  'WikiOffline'),
+          # ('https://busrouter.sg', 'BusRouter'),
+          # ('https://airhorner.com', 'AirHorner'),
+      ], cache_temperatures_for_pwa, traffic_settings)
+
+    if '*' in include_tags or 'tough_ttfmp' in include_tags:
+      self.AddStories(['tough_ttfmp'], [
+          ('http://www.localmoxie.com', 'LocalMoxie'),
+          ('http://www.dawn.com', 'Dawn'),
+          ('http://www.thairath.co.th', 'Thairath'),
+      ], cache_temperatures, traffic_settings)
+
+    if '*' in include_tags or 'easy_ttfmp' in include_tags:
+      self.AddStories(['easy_ttfmp'], [
+          ('http://www.slideshare.net', 'SlideShare'),
+          ('http://www.bradesco.com.br', 'Bradesco'),
+          ('http://www.gsshop.com', 'GSShop'),
+      ], cache_temperatures, traffic_settings)
+
+    if '*' in include_tags or 'tough_tti' in include_tags:
+      self.AddStories(['tough_tti'], [
+          ('http://www.thestar.com.my', 'TheStar'),
+          ('http://www.58pic.com', '58Pic'),
+          ('http://www.hongkiat.com', 'Hongkiat'),
+      ], cache_temperatures, traffic_settings)
+
+    if '*' in include_tags or 'easy_tti' in include_tags:
+      self.AddStories(['easy_tti'], [
+          ('http://www.dramaq.com.tw', 'Dramaq'),
+          ('http://www.locanto.in', 'Locanto'),
+          ('http://www.francetvinfo.fr', 'FranceTVInfo'),
+      ], cache_temperatures, traffic_settings)
+
+    # The many_agents stories are not added unless explicitly specified to keep
+    # loading.{mobile,desktop} benchmarks short.
+    if 'many_agents' in include_tags:
+      self.AddStories(['many_agents'], [
+          ('https://www.amazon.co.jp', 'AmazonJP'),
+          ('https://www.netflix.com', 'Netflix'),
+          ('https://sina.com.cn', 'Sina'),
+          ('https://www.ebay.com', 'Ebay'),
+          ('https://www.msn.com', 'MSN'),
+          ('https://www.imdb.com', 'IMDB'),
+          ('https://www.cnn.com', 'CNN'),
+          ('https://www.bbc.com', 'BBC'),
+          ('https://www.espn.com', 'ESPN'),
+          ('https://www.nytimes.com', 'NyTimes'),
+          ('https://www.nicovideo.jp', 'Nicovideo'),
+          ('https://www.cricbuzz.com', 'Cricbuzz'),
+          ('https://www.theguardian.com', 'TheGuardian'),
+          ('https://www.cnet.com', 'CNet'),
+          ('https://www.indiatimes.com', 'IndiaTimes'),
+          ('https://www.sindonews.com', 'SindoNews'),
+      ], cache_temperatures, traffic_settings)
 
   def GetAbridgedStorySetTagFilter(self):
     return ABRIDGED.name