[Android] Switch the x86, x64, and mips builders on chromium.android to mb.

scripts/slave/recipe_modules/amp/example.py

 
 DEPS = [
   'amp',
   'recipe_engine/json',
   'recipe_engine/path',
   'recipe_engine/properties',
 ]
 
 BUILDERS = {
   'normal_example': {
@@ skipping 60 matching lines @@
     'api_protocol': 'http',
   },
   'network_config_set': {
     'device_name': ['SampleDevice'],
     'device_os': ['SampleDeviceOS'],
     'api_address': '127.0.0.1',
     'api_port': '80',
     'api_protocol': 'http',
     'network_config': 8, # Sprint 4G 1 Bar
   },
+  'slow_tests': {

[martiniss, 2016/01/27 22:43:13]

Why are you adding this configuration here? Test coverage?

[jbudorick, 2016/01/27 22:47:53]

yep, covering timeout_scale and test_run_timeout.

(removed network_config)

+    'device_name': ['SampleDevice'],
+    'device_os': ['SampleDeviceOS'],
+    'api_address': '127.0.0.1',
+    'api_port': '80',
+    'api_protocol': 'http',
+    'network_config': 8, # Sprint 4G 1 Bar
+    'timeout_scale': 10,
+    'test_run_timeout': 3600,
+  },
 }
 
 AMP_RESULTS_BUCKET = 'chrome-amp-results'
 
 from recipe_engine.recipe_api import Property
 
 PROPERTIES = {
   'buildername': Property(),
 }
 
@@ skipping 18 matching lines @@
           api_protocol=builder.get('api_protocol', None),
           network_config=builder.get('network_config', None)))
 
   instrumentation_test_id = api.amp.trigger_test_suite(
       'example_instrumentation_suite', 'instrumentation',
       api.amp.instrumentation_test_arguments(
           apk_under_test='ApkUnderTest.apk',
           test_apk='TestApk.apk',
           additional_apks=['ExtraApk1.apk', 'ExtraApk2.apk'],
           isolate_file_path='isolate_file.isolate',
-          annotation='SmallTest'),
+          annotation='SmallTest',
+          timeout_scale=builder.get('timeout_scale')),
       api.amp.amp_arguments(
           device_minimum_os=builder.get('device_minimum_os', None),
           device_name=builder.get('device_name', None),
           device_oem=builder.get('device_oem', None),
           device_os=builder.get('device_os', None),
           device_timeout=builder.get('device_timeout', None),
           api_address=builder.get('api_address', None),
           api_port=builder.get('api_port', None),
           api_protocol=builder.get('api_protocol', None),
-          network_config=builder.get('network_config', None)))
+          network_config=builder.get('network_config', None),
+          test_run_timeout=builder.get('test_run_timeout')))
  
   uirobot_test_id = api.amp.trigger_test_suite(
       'example_uirobot_suite', 'uirobot',
       api.amp.uirobot_arguments(app_under_test='Example.apk'),
       api.amp.amp_arguments(
           device_minimum_os=builder.get('device_minimum_os', None),
           device_name=builder.get('device_name', None),
           device_oem=builder.get('device_oem', None),
           device_os=builder.get('device_os', None),
           device_timeout=builder.get('device_timeout', None),
@@ skipping 56 matching lines @@
       api.test('bad_device_data_for_collect') +
       api.properties.generic(buildername='split_example') +
       api.override_step_data('[collect] load example_gtest_suite',
                              api.json.output({})))
 
   yield (
     api.test('bad_test_id_data_for_upload') +
     api.properties.generic(buildername='split_example') +
     api.override_step_data('[upload logcat] load example_gtest_suite data',
                            api.json.output({})))