Pass through in dual_browser_story for disabled benchmarks.

tools/perf/page_sets/dual_browser_story.py

Index: tools/perf/page_sets/dual_browser_story.py
diff --git a/tools/perf/page_sets/dual_browser_story.py b/tools/perf/page_sets/dual_browser_story.py
index d21e0e666782eed1804a9ac989b92c4e5ca62e24..e50fbe7f4636f4ed38941dd1f6af6cf3ee1be56c 100644
--- a/tools/perf/page_sets/dual_browser_story.py
+++ b/tools/perf/page_sets/dual_browser_story.py
@@ -5,10 +5,8 @@
 import collections
 import logging
 import re
-import sys
 import urllib
 
-from telemetry import decorators
 from telemetry import story as story_module
 # TODO(perezju): Remove references to telementry.internal when
 # https://github.com/catapult-project/catapult/issues/2102 is resolved.
@@ -78,18 +76,17 @@ class MultiBrowserSharedState(story_module.SharedState):
       raise browser_finder_exceptions.BrowserFinderException(
           'No browser found.\n\nAvailable browsers:\n%s\n' %
           '\n'.join(browser_finder.GetAllAvailableBrowserTypes(finder_options)))
-    if not finder_options.run_disabled_tests:
-      self._CheckTestEnabled(test, possible_browser)
 
     extra_browser_types = set(story.browser_type for story in story_set)
     extra_browser_types.remove('default')  # Must include 'default' browser.
     for browser_type in extra_browser_types:
       options = _OptionsForBrowser(browser_type, finder_options)
       if not self._PrepareBrowser(browser_type, options):
-        logging.warning('Skipping %s (%s) because %s browser is not available',
-                        test.__name__, str(test), browser_type)
+        logging.warning(
+          'Cannot run %s (%s) because %s browser is not available',
+          test.__name__, str(test), browser_type)
         logging.warning('Install %s to be able to run the test.', browser_type)
-        sys.exit(0)
+        raise Exception("Browser not available, unable to run benchmark.")
 
     # TODO(crbug/404771): Move network controller options out of
     # browser_options and into finder_options.
@@ -112,15 +109,6 @@ class MultiBrowserSharedState(story_module.SharedState):
   def platform(self):
     return self._platform
 
-  def _CheckTestEnabled(self, test, possible_browser):
-    should_skip, msg = decorators.ShouldSkip(test, possible_browser)
-    if should_skip:
-      logging.warning(msg)
-      logging.warning('You are trying to run a disabled test.')
-      logging.warning(
-          'Pass --also-run-disabled-tests to squelch this message.')
-      sys.exit(0)
-
   def _PrepareBrowser(self, browser_type, options):
     """Add a browser to the dict of possible browsers.