[Telemetry] Remove logic that handles case test=None in page_runner.py

tools/telemetry/telemetry/page/page_runner.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import logging
 import optparse
 import os
 import random
 import sys
 import tempfile
 import time
 
 from telemetry import decorators
 from telemetry.core import browser_finder
 from telemetry.core import browser_info
 from telemetry.core import exceptions
 from telemetry.core import util
 from telemetry.core import wpr_modes
 from telemetry.core.platform.profiler import profiler_finder
 from telemetry.page import page_filter
 from telemetry.page import page_test
-from telemetry.page.actions import navigate
 from telemetry.page.actions import page_action
 from telemetry.results import results_options
 from telemetry.util import cloud_storage
 from telemetry.util import exception_formatter
 from telemetry.value import failure
 from telemetry.value import skip
 
 
 class _RunState(object):
   def __init__(self):
@@ skipping 100 matching lines @@
     if is_repeating:
       output_file = util.GetSequentialFileName(output_file)
     self.browser.platform.profiling_controller.Start(
         finder_options.profiler, output_file)
 
   def StopProfiling(self):
     if self.browser:
       self.browser.platform.profiling_controller.Stop()
 
 
-class PageState(object):
+class _PageState(object):
   def __init__(self, page, tab):
     self.page = page
     self.tab = tab
 
     self._did_login = False
 
-  def PreparePage(self, test=None):
+  def PreparePage(self, test):
     if self.page.is_file:
       self.tab.browser.SetHTTPServerDirectories(
           self.page.page_set.serving_dirs | set([self.page.serving_dir]))
 
     if self.page.credentials:
       if not self.tab.browser.credentials.LoginNeeded(
           self.tab, self.page.credentials):
         raise page_test.Failure('Login as ' + self.page.credentials + ' failed')
       self._did_login = True
 
-    if test:
-      if test.clear_cache_before_each_run:
-        self.tab.ClearCache(force=True)
+    if test.clear_cache_before_each_run:
+      self.tab.ClearCache(force=True)
 
-  def ImplicitPageNavigation(self, test=None):
+  def ImplicitPageNavigation(self, test):
     """Executes the implicit navigation that occurs for every page iteration.
 
     This function will be called once per page before any actions are executed.
     """
-    if test:
-      test.WillNavigateToPage(self.page, self.tab)
-      test.RunNavigateSteps(self.page, self.tab)
-      test.DidNavigateToPage(self.page, self.tab)
-    else:
-      i = navigate.NavigateAction()
-      i.RunAction(self.page, self.tab, None)
+    test.WillNavigateToPage(self.page, self.tab)
+    test.RunNavigateSteps(self.page, self.tab)
+    test.DidNavigateToPage(self.page, self.tab)
 
   def CleanUpPage(self, test):
     test.CleanUpAfterPage(self.page, self.tab)
     if self.page.credentials and self._did_login:
       self.tab.browser.credentials.LoginNoLongerNeeded(
           self.tab, self.page.credentials)
 
 
 def AddCommandLineArgs(parser):
   page_filter.PageFilter.AddCommandLineArgs(parser)
@@ skipping 276 matching lines @@
     results.DidRunPage(page)
   return valid_pages
 
 
 def _RunPage(test, page, state, expectation, results):
   if expectation == 'skip':
     logging.debug('Skipping test: Skip expectation for %s', page.url)
     results.AddValue(skip.SkipValue(page, 'Skipped by test expectations'))
     return
 
-  page_state = PageState(page, test.TabForPage(page, state.browser))
+  page_state = _PageState(page, test.TabForPage(page, state.browser))
 
   def ProcessError():
     if expectation == 'fail':
       msg = 'Expected exception while running %s' % page.url
     else:
       msg = 'Exception while running %s' % page.url
       results.AddValue(failure.FailureValue(page, sys.exc_info()))
     exception_formatter.PrintFormattedException(msg=msg)
 
   try:
@@ skipping 46 matching lines @@
     logging.warning('Device is thermally throttled before running '
                     'performance tests, results will vary.')
 
 
 def _CheckThermalThrottling(platform):
   if not platform.CanMonitorThermalThrottling():
     return
   if platform.HasBeenThermallyThrottled():
     logging.warning('Device has been thermally throttled during '
                     'performance tests, results will vary.')