Update from chromium https://crrev.com/304586

build/android/pylib/instrumentation/test_runner.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.
 
 """Class for running instrumentation tests on a single device."""
 
 import logging
 import os
 import re
 import sys
@@ skipping 190 matching lines @@
 
   def _IsFreTest(self, test):
     """Determines whether a test is a first run experience test.
 
     Args:
       test: The name of the test to be checked.
 
     Returns:
       Whether the feature being tested is FirstRunExperience.
     """
-    freFeature = 'Feature:FirstRunExperience'
-    return freFeature in self.test_pkg.GetTestAnnotations(test)
+    annotations = self.test_pkg.GetTestAnnotations(test)
+    return ('FirstRunExperience' == annotations.get('Feature', None))
 
   def _IsPerfTest(self, test):
     """Determines whether a test is a performance test.
 
     Args:
       test: The name of the test to be checked.
 
     Returns:
       Whether the test is annotated as a performance test.
     """
@@ skipping 99 matching lines @@
 
   def _SetupIndividualTestTimeoutScale(self, test):
     timeout_scale = self._GetIndividualTestTimeoutScale(test)
     valgrind_tools.SetChromeTimeoutScale(self.device, timeout_scale)
 
   def _GetIndividualTestTimeoutScale(self, test):
     """Returns the timeout scale for the given |test|."""
     annotations = self.test_pkg.GetTestAnnotations(test)
     timeout_scale = 1
     if 'TimeoutScale' in annotations:
-      for annotation in annotations:
-        scale_match = re.match('TimeoutScale:([0-9]+)', annotation)
-        if scale_match:
-          timeout_scale = int(scale_match.group(1))
+      try:
+        timeout_scale = int(annotations['TimeoutScale'])
+      except ValueError:
+        logging.warning('Non-integer value of TimeoutScale ignored. (%s)'
+                        % annotations['TimeoutScale'])
     if self.options.wait_for_debugger:
       timeout_scale *= 100
     return timeout_scale
 
   def _GetIndividualTestTimeoutSecs(self, test):
     """Returns the timeout in seconds for the given |test|."""
     annotations = self.test_pkg.GetTestAnnotations(test)
     if 'Manual' in annotations:
       return 10 * 60 * 60
     if 'IntegrationTest' in annotations:
@@ skipping 174 matching lines @@
     except device_errors.CommandTimeoutError as e:
       results.AddResult(test_result.InstrumentationTestResult(
           test, base_test_result.ResultType.TIMEOUT, start_ms, duration_ms,
           log=str(e) or 'No information'))
     except device_errors.DeviceUnreachableError as e:
       results.AddResult(test_result.InstrumentationTestResult(
           test, base_test_result.ResultType.CRASH, start_ms, duration_ms,
           log=str(e) or 'No information'))
     self.TestTeardown(test, results)
     return (results, None if results.DidRunPass() else test)