[Telemetry] Move more browser specific logic to shared_page_state

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 time
 
 from telemetry import decorators
-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 shared_page_state
 from telemetry.page import page_filter
 from telemetry.page import page_test
 from telemetry.page.actions import page_action
 from telemetry.results import results_options
 from telemetry.util import cloud_storage
@@ skipping 59 matching lines @@
   def ProcessError():
     if expectation == 'fail':
       msg = 'Expected exception while running %s' % page.url
       exception_formatter.PrintFormattedException(msg=msg)
     else:
       msg = 'Exception while running %s' % page.url
       results.AddValue(failure.FailureValue(page, sys.exc_info()))
 
   try:
     state.WillRunPage(page, page_set)
-    if not page.CanRunOnBrowser(browser_info.BrowserInfo(state.browser)):
-      logging.info('Skip test for page %s because browser is not supported.'
-                   % page.url)
+    expectation, skip_value = state.GetPageExpectationAndSkipValue(expectations)
+    if expectation == 'skip':
+      assert skip_value

[tonyg, 2014/11/17 18:35:10]

We probably want an error message w/ this assert.

[nednguyen, 2014/11/17 19:38:00]

results.AddValue(skip_value) does display skip_value's reason in
gtest_progress_reporter.
 

+      results.AddValue(skip_value)
       return
-    expectation = expectations.GetExpectationForPage(state.browser, page)
-
-    if expectation == 'skip':
-      logging.debug('Skipping test: Skip expectation for %s', page.url)
-      results.AddValue(skip.SkipValue(page, 'Skipped by test expectations'))
-      return
-
-    state.PreparePage()
-    state.ImplicitPageNavigation()
     state.RunPage(results)
   except page_test.TestNotSupportedOnPlatformFailure:
     raise
   except (page_test.Failure, util.TimeoutException, exceptions.LoginException,
           exceptions.ProfilingException):
     ProcessError()
   except (exceptions.TabCrashException, exceptions.BrowserGoneException):
     ProcessError()
     state.TearDown()
     if test.is_multi_tab_test:
       logging.error('Aborting multi-tab test after browser or tab crashed at '
                     'page %s' % page.url)
       test.RequestExit()
       return
   except page_action.PageActionNotSupported as e:
     results.AddValue(skip.SkipValue(page, 'Unsupported page action: %s' % e))
   except Exception:
     exception_formatter.PrintFormattedException(
         msg='Unhandled exception while running %s' % page.url)
     results.AddValue(failure.FailureValue(page, sys.exc_info()))
   else:
     if expectation == 'fail':
       logging.warning('%s was expected to fail, but passed.\n', page.url)
   finally:
-    state.CleanUpPage()
     state.DidRunPage()
 
 
 @decorators.Cache
 def _UpdatePageSetArchivesIfChanged(page_set):
   # Scan every serving directory for .sha1 files
   # and download them from Cloud Storage. Assume all data is public.
   all_serving_dirs = page_set.serving_dirs.copy()
   # Add individual page dirs to all serving dirs.
   for page in page_set:
@@ skipping 159 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.')