Revert of [PCv2] add benchmark page_cycler_v2.typical_25

tools/perf/page_sets/typical_25.py

Index: tools/perf/page_sets/typical_25.py
diff --git a/tools/perf/page_sets/typical_25.py b/tools/perf/page_sets/typical_25.py
index 8f056c143767073ab231703a7263d6fe42934392..f871ede714dcf9ada23ddb814f13802368b1d384 100644
--- a/tools/perf/page_sets/typical_25.py
+++ b/tools/perf/page_sets/typical_25.py
@@ -6,7 +6,6 @@
 
 from profile_creators import profile_generator
 from telemetry.page import page as page_module
-from telemetry.page import cache_temperature as cache_temperature_module
 from telemetry.page import shared_page_state
 from telemetry import story
 
@@ -40,12 +39,10 @@
 class Typical25Page(page_module.Page):
 
   def __init__(self, url, page_set, run_no_page_interactions,
-      shared_page_state_class=shared_page_state.SharedDesktopPageState,
-      cache_temperature=None):
+      shared_page_state_class=shared_page_state.SharedDesktopPageState):
     super(Typical25Page, self).__init__(
         url=url, page_set=page_set,
-        shared_page_state_class=shared_page_state_class,
-        cache_temperature=cache_temperature)
+        shared_page_state_class=shared_page_state_class)
     self._run_no_page_interactions = run_no_page_interactions
 
   def RunPageInteractions(self, action_runner):
@@ -60,13 +57,10 @@
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self, run_no_page_interactions=False,
-               page_class=Typical25Page,
-               cache_temperatures=None):
+               page_class=Typical25Page):
     super(Typical25PageSet, self).__init__(
       archive_data_file='data/typical_25.json',
       cloud_storage_bucket=story.PARTNER_BUCKET)
-    if cache_temperatures is None:
-      cache_temperatures = [cache_temperature_module.ANY]
 
     urls_list = [
       # Why: Alexa games #48
@@ -110,6 +104,5 @@
     ]
 
     for url in urls_list:
-      for temp in cache_temperatures:
-        self.AddStory(page_class(
-          url, self, run_no_page_interactions, cache_temperature=temp))
+      self.AddStory(
+        page_class(url, self, run_no_page_interactions))