[Android] Support --timeout-scale for generated instrumentation tests.

scripts/slave/recipe_modules/chromium_tests/steps.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 re
 import string
 
 
 class Test(object):
   """
@@ skipping 489 matching lines @@
         swarming_dimension_sets = swarming_spec.get('dimension_sets')
         swarming_priority = swarming_spec.get('priority_adjustment')
         swarming_expiration = swarming_spec.get('expiration')
     if use_swarming and swarming_dimension_sets:
       for dimensions in swarming_dimension_sets:
         # TODO(stip): Swarmify instrumentation tests
         pass
     else:
       yield AndroidInstrumentationTest(
           test_name,
-          compile_targets=test.get('override_compile_targets', None))
+          compile_targets=test.get('override_compile_targets'),
+          timeout_scale=test.get('timeout_scale'))
 
 
 def generate_junit_test(api, chromium_tests_api, mastername, buildername,
                         test_spec, bot_update_step, enable_swarming=False,
                         swarming_dimensions=None,
                         scripts_compile_targets=None):
   for test in test_spec.get(buildername, {}).get('junit_tests', []):
     yield AndroidJunitTest(str(test['test']))
 
 
@@ skipping 1339 matching lines @@
   def run(self, api, suffix, test_filter=None):
     api.chromium_android.coverage_report(upload=False)
     api.chromium_android.get_changed_lines_for_revision()
     api.chromium_android.incremental_coverage_report()
 
 
 GOMA_TESTS = [
   GTestTest('base_unittests'),
   GTestTest('content_unittests'),
 ]