Make sure page of different cache temperatures & traffic settings are named differently

We will remove the grouping key feature in Telemetry, hence these stories need
to be named differently (right now, they are named the same but have different
grouping keys)

Bug: 849363
Change-Id: I360aea0720c13383486fdb113ceda775c9a4f136
Reviewed-on: https://chromium-review.googlesource.com/1101542
Commit-Queue: Ned Nguyen <nednguyen@google.com>
Reviewed-by: Ben Hayden <benjhayden@chromium.org>
Cr-Commit-Position: refs/heads/master@{#567698}

tools/perf/expectations.config

@@ -72,8 +72,10 @@ crbug.com/850293 [ All ] blink_perf.svg/Cowboy_transform.html [ Skip ]
 crbug.com/830600 [ Nexus5X_Webview ] jetstream/http://browserbench.org/JetStream/ [ Skip ]
 
 # Benchmark: loading.desktop
-crbug.com/723783 [ Win ] loading.desktop/Orange [ Skip ]
-crbug.com/752611 [ Linux ] loading.desktop/uol.com.br [ Skip ]
+crbug.com/723783 [ Win ] loading.desktop/Orange_cold [ Skip ]
+crbug.com/723783 [ Win ] loading.desktop/Orange_warm [ Skip ]
+crbug.com/752611 [ Linux ] loading.desktop/uol.com.br_cold [ Skip ]
+crbug.com/752611 [ Linux ] loading.desktop/uol.com.br_warm [ Skip ]
 
 # Benchmark: loading.mobile
 crbug.com/676612 [ Nexus6_Webview ] loading.mobile/* [ Skip ]
@@ -490,6 +492,9 @@ crbug.com/814012 [ Win ] wasm/AsmJsZenGarden [ Skip ]
 
 ##### Perf FYI benchmarks go after here #####
 # Benchmark: loading.desktop.network_service
-crbug.com/723783 [ Win ] loading.desktop.network_service/Orange [ Skip ]
-crbug.com/752611 [ Linux ] loading.desktop.network_service/uol.com.br [ Skip ]
-crbug.com/851171 [ All ] loading.desktop.network_service/Elmundo [ Skip ]
+crbug.com/723783 [ Win ] loading.desktop.network_service/Orange_cold [ Skip ]
+crbug.com/723783 [ Win ] loading.desktop.network_service/Orange_warm [ Skip ]
+crbug.com/752611 [ Linux ] loading.desktop.network_service/uol.com.br_cold [ Skip ]
+crbug.com/752611 [ Linux ] loading.desktop.network_service/uol.com.br_warm [ Skip ]
+crbug.com/851171 [ All ] loading.desktop.network_service/Elmundo_cold [ Skip ]
+crbug.com/851171 [ All ] loading.desktop.network_service/Elmundo_warm [ Skip ]

tools/perf/page_sets/loading_desktop.py

@@ -98,6 +98,14 @@ class LoadingDesktopStorySet(story.StorySet):
   def AddStories(self, tags, urls, cache_temperatures):
     for url, name in urls:
       for temp in cache_temperatures:
-          self.AddStory(page_cycler_story.PageCyclerStory(url, self,
-              shared_page_state_class=shared_page_state.SharedDesktopPageState,
-              cache_temperature=temp, tags=tags, name=name))
+        if temp == cache_temperature_module.COLD:
+          page_name = name + '_cold'
+          tags.append('cache_temperature_cold')
+        elif temp == cache_temperature_module.WARM:
+          page_name = name + '_warm'
+          tags.append('cache_temperature_warm')
+        else:
+          raise NotImplementedError
+        self.AddStory(page_cycler_story.PageCyclerStory(url, self,
+            shared_page_state_class=shared_page_state.SharedDesktopPageState,
+            cache_temperature=temp, tags=tags, name=page_name))

tools/perf/page_sets/loading_mobile.py

@@ -129,6 +129,25 @@ class LoadingMobileStorySet(story.StorySet):
     for url, name in urls:
       for temp in cache_temperatures:
         for traffic in traffic_settings:
-          self.AddStory(page_cycler_story.PageCyclerStory(url, self, name=name,
+          page_name = name
+          if temp == cache_temperature_module.COLD:
+            page_name += '_cold'
+            tags.append('cache_temperature_cold')
+          elif temp == cache_temperature_module.WARM:
+            page_name += '_warm'
+            tags.append('cache_temperature_warm')
+          elif temp == cache_temperature_module.HOT:
+            page_name += '_hot'
+            tags.append('cache_temperature_hot')
+          elif temp == cache_temperature_module.ANY:
+            pass
+          else:
+            raise NotImplementedError
+
+          if traffic == traffic_setting_module.REGULAR_3G:
+            page_name += '_3g'
+
+          self.AddStory(page_cycler_story.PageCyclerStory(
+              url, self, name=page_name,
               shared_page_state_class=shared_page_state.SharedMobilePageState,
               cache_temperature=temp, traffic_setting=traffic, tags=tags))

tools/perf/page_sets/v8_top_25.py

@@ -88,9 +88,25 @@ class V8Top25Story(page_cycler_story.PageCyclerStory):
 
   def __init__(self, url, page_set, name='',
                cache_temperature=cache_temperature_module.ANY, scroll=False):
+    tags = []
+    temp_suffix = ''
+    if cache_temperature == cache_temperature_module.COLD:
+      temp_suffix = '_cold'
+      tags = ['cold']
+    elif cache_temperature == cache_temperature_module.WARM_BROWSER:
+      temp_suffix = '_warm'
+      tags = ['warm']
+    elif cache_temperature == cache_temperature_module.HOT_BROWSER:
+      temp_suffix = '_hot'
+      tags = ['hot']
+    elif cache_temperature == cache_temperature_module.ANY:
+      pass
+    else:
+      raise NotImplementedError
+
     super(V8Top25Story, self).__init__(
-        url=url, page_set=page_set, name=name,
-        cache_temperature=cache_temperature)
+        url=url, page_set=page_set, name=name + temp_suffix,
+        cache_temperature=cache_temperature, tags=tags)
     self.remaining_warmups = temperature_warmup_run_count[cache_temperature]
     self.should_scroll=scroll
 
@@ -107,6 +123,7 @@ class V8Top25Story(page_cycler_story.PageCyclerStory):
         action_runner.Wait(2)
         self.remaining_warmups -= 1
 
+
 class V8Top25StorySet(story.StorySet):
   """~25 of top pages, used for v8 testing. They represent popular websites as
   well as other pages the V8 team wants to track due to their unique
@@ -124,5 +141,6 @@ class V8Top25StorySet(story.StorySet):
 
     for (url, name, needs_scroll) in ads_urls_list:
       for temp in cache_temperatures:
-        self.AddStory(V8Top25Story(url, self, 'Ads'+name,
+
+        self.AddStory(V8Top25Story(url, self, 'Ads' + name,
           cache_temperature=temp, scroll=needs_scroll))