Allow disabled tests on cros to be run with -d flag.

tools/telemetry/telemetry/unittest/run_tests.py

 # Copyright (c) 2012 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 unittest
 
 from telemetry.core import browser_options
 from telemetry.core import discover
 from telemetry.core import util
 from telemetry.core.backends.chrome import cros_interface
@@ skipping 52 matching lines @@
         return False
 
     if hasattr(test, '_testMethodName'):
       method = getattr(test, test._testMethodName) # pylint: disable=W0212
       if hasattr(method, '_requires_browser_types'):
         types = method._requires_browser_types # pylint: disable=W0212
         if options_for_unittests.GetBrowserType() not in types:
           logging.debug('Skipping test %s because it requires %s' %
                         (test.id(), types))
           return False
-      if hasattr(method, '_disabled_test'):
-        if not run_disabled_tests:
-          return False
-      if (hasattr(method, '_disabled_test_on_cros') and
-          cros_interface.IsRunningOnCrosDevice()):
+
+      if (not run_disabled_tests and
+          (hasattr(method, '_disabled_test') or
+              (hasattr(method, '_disabled_test_on_cros') and
+                  cros_interface.IsRunningOnCrosDevice()))):
         return False
 
     return True
 
   filtered_suite = FilterSuite(suite, IsTestSelected)
   test_result = runner.run(filtered_suite)
   return test_result
 
 
 def RestoreLoggingLevel(func):
@@ skipping 55 matching lines @@
         default_options.run_test_repeat_count): # pylint: disable=E1101
       success = success and DiscoverAndRunTests(
         start_dir, args, top_level_dir,
         runner, default_options.run_disabled_tests)
     if success:
       return 0
   finally:
     options_for_unittests.Set(None, None)
 
   return 1