[Android] Set flags for uiautomator based on annotations not test name.

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.
 
 """Runs the Java tests. See more information on run_instrumentation_tests.py."""
 
 import logging
 import os
 import re
 import shutil
@@ skipping 355 matching lines @@
     if 'Manual' in annotations:
       return 600 * 60
     if 'External' in annotations:
       return 10 * 60
     if 'LargeTest' in annotations or _PERF_TEST_ANNOTATION in annotations:
       return 5 * 60
     if 'MediumTest' in annotations:
       return 3 * 60
     return 1 * 60
 
+  def _RunUIAutomatorTest(self, test, timeout):
+    """Runs a single uiautomator test.
+
+    Args:
+      test: Test class/method.
+      timeout: Timeout time in seconds.
+
+    Returns:
+      An instance of am_instrument_parser.TestResult object.
+    """
+    self.adb.ClearApplicationState(self.package_name)
+    if 'Feature:FirstRunExperience' in self.test_pkg.GetTestAnnotations(test):
+      self.flags.RemoveFlags(['--disable-fre'])
+    else:
+      self.flags.AddFlags(['--disable-fre'])
+    return self.adb.RunUIAutomatorTest(
+        test, self.test_pkg.GetPackageName(), timeout)
+
   #override.
   def RunTest(self, test):
     raw_result = None
     start_date_ms = None
     results = base_test_result.TestRunResults()
     timeout=(self._GetIndividualTestTimeoutSecs(test) *
              self._GetIndividualTestTimeoutScale(test) *
              self.tool.GetTimeoutScale())
     try:
       self.TestSetup(test)
       start_date_ms = int(time.time()) * 1000
 
       if self.is_uiautomator_test:
-        self.adb.ClearApplicationState(self.package_name)
-        # TODO(frankf): Stop-gap solution. Should use annotations.
-        if 'FirstRun' in test:
-          self.flags.RemoveFlags(['--disable-fre'])
-        else:
-          self.flags.AddFlags(['--disable-fre'])
-        raw_result = self.adb.RunUIAutomatorTest(
-            test, self.test_pkg.GetPackageName(), timeout)
+        raw_result = self._RunUIAutomatorTest(test, timeout)
       else:
         raw_result = self.adb.RunInstrumentationTest(
             test, self.test_pkg.GetPackageName(),
             self._GetInstrumentationArgs(), timeout)
 
       duration_ms = int(time.time()) * 1000 - start_date_ms
       status_code = raw_result.GetStatusCode()
       if status_code:
         log = raw_result.GetFailureReason()
         if not log:
@@ skipping 19 matching lines @@
         duration_ms = 0
       message = str(e)
       if not message:
         message = 'No information.'
       results.AddResult(test_result.InstrumentationTestResult(
           test, base_test_result.ResultType.CRASH, start_date_ms, duration_ms,
           log=message))
       raw_result = None
     self.TestTeardown(test, raw_result)
     return (results, None if results.DidRunPass() else test)