Revert of [Telemetry] Remove empty action_name_to_run for Startup, SessionRestore (patchset #1 id:1 of https://codereview.chromium.org/796813003/)

Reason for revert:
crbug.com/446114

Original issue's description:
> [Telemetry] Remove empty action_name_to_run for Startup, SessionRestore
> measurements.
>
> BUG=418375
>
> Committed: https://crrev.com/428ccd0af12a038069f330beb1f4fa7300f2bbd6
> Cr-Commit-Position: refs/heads/master@{#309845}

TBR=tonyg@chromium.org,ernstm@chromium.org,sullivan@chromium.org
BUG=418375, 446114

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

Cr-Commit-Position: refs/heads/master@{#309939}

4 files changed, 7 insertions, 12 deletions

diff --git a/tools/perf/benchmarks/session_restore.py b/tools/perf/benchmarks/session_restore.py
index 59a96ad..305396c 100644
--- a/tools/perf/benchmarks/session_restore.py
+++ b/tools/perf/benchmarks/session_restore.py
@@ -38,14 +38,12 @@ class _SessionRestoreTest(benchmark.Benchmark):
     is_cold = (self.tag == 'cold')
     return self.test(cold=is_cold)
 
-  def CreatePageSet(self, options):
-    return page_sets.Typical25PageSet(make_pages_with_no_interactions=True)
-
 # crbug.com/325479, crbug.com/381990
 @benchmark.Disabled('android', 'linux', 'reference')
 class SessionRestoreColdTypical25(_SessionRestoreTest):
   tag = 'cold'
   test = session_restore.SessionRestore
+  page_set = page_sets.Typical25PageSet
   options = {'pageset_repeat': 5}
 
 
@@ -54,4 +52,5 @@ class SessionRestoreColdTypical25(_SessionRestoreTest):
 class SessionRestoreWarmTypical25(_SessionRestoreTest):
   tag = 'warm'
   test = session_restore.SessionRestore
+  page_set = page_sets.Typical25PageSet
   options = {'pageset_repeat': 20}
diff --git a/tools/perf/measurements/session_restore.py b/tools/perf/measurements/session_restore.py
index 2d7ec00..b72bda5 100644
--- a/tools/perf/measurements/session_restore.py
+++ b/tools/perf/measurements/session_restore.py
@@ -19,7 +19,7 @@ class SessionRestore(startup.Startup):
   see startup.py for details.
   """
 
-  def __init__(self, cold=False, action_name_to_run='RunPageInteractions'):
+  def __init__(self, cold=False, action_name_to_run = ''):
     super(SessionRestore, self).__init__(cold=cold,
                                          action_name_to_run=action_name_to_run)
     self.close_tabs_before_run = False
diff --git a/tools/perf/measurements/startup.py b/tools/perf/measurements/startup.py
index 51a9005..609a621 100644
--- a/tools/perf/measurements/startup.py
+++ b/tools/perf/measurements/startup.py
@@ -15,7 +15,7 @@ class Startup(page_test.PageTest):
   repeat the page set to ensure it's cached.
   """
 
-  def __init__(self, cold=False, action_name_to_run='RunPageInteractions'):
+  def __init__(self, cold=False, action_name_to_run=''):
     super(Startup, self).__init__(needs_browser_restart_after_each_page=True,
                                   action_name_to_run=action_name_to_run)
     self._cold = cold
diff --git a/tools/perf/page_sets/typical_25.py b/tools/perf/page_sets/typical_25.py
index 57983bb..89395a3 100644
--- a/tools/perf/page_sets/typical_25.py
+++ b/tools/perf/page_sets/typical_25.py
@@ -7,15 +7,12 @@ from telemetry.page import page_set as page_set_module
 
 class Typical25Page(page_module.Page):
 
-  def __init__(self, url, page_set, run_no_page_interactions):
+  def __init__(self, url, page_set):
     super(Typical25Page, self).__init__(url=url, page_set=page_set)
     self.user_agent_type = 'desktop'
     self.archive_data_file = 'data/typical_25.json'
-    self._run_no_page_interactions = run_no_page_interactions
 
   def RunPageInteractions(self, action_runner):
-    if self._run_no_page_interactions:
-      return
     interaction = action_runner.BeginGestureInteraction(
         'ScrollAction', is_smooth=True)
     action_runner.ScrollPage()
@@ -26,7 +23,7 @@ class Typical25PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
-  def __init__(self, make_pages_with_no_interactions=False):
+  def __init__(self):
     super(Typical25PageSet, self).__init__(
       user_agent_type='desktop',
       archive_data_file='data/typical_25.json',
@@ -74,5 +71,4 @@ class Typical25PageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddUserStory(
-        Typical25Page(url, self, make_pages_with_no_interactions))
+      self.AddUserStory(Typical25Page(url, self))