Replace deprecated Android java test annotations

build/android/test_runner.py

 #!/usr/bin/env python
 #
 # Copyright 2013 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 all types of tests from one unified interface."""
 
 import argparse
 import collections
@@ skipping 297 matching lines @@
 
 def ProcessJavaTestOptions(args):
   """Processes options/arguments and populates |options| with defaults."""
 
   # TODO(jbudorick): Handle most of this function in argparse.
   if args.annotation_str:
     args.annotations = args.annotation_str.split(',')
   elif args.test_filter:
     args.annotations = []
   else:
-    args.annotations = ['Smoke', 'SmallTest', 'MediumTest', 'LargeTest',
-                        'EnormousTest', 'IntegrationTest']
+    args.annotations = ['SmallTest', 'MediumTest', 'LargeTest', 'EnormousTest',
+                        'IntegrationTest']
 
   if args.exclude_annotation_str:
     args.exclude_annotations = args.exclude_annotation_str.split(',')
   else:
     args.exclude_annotations = []
 
 
 def AddInstrumentationTestOptions(parser):
   """Adds Instrumentation test options to |parser|."""
 
@@ skipping 550 matching lines @@
     if e.is_infra_error:
       return constants.INFRA_EXIT_CODE
     return constants.ERROR_EXIT_CODE
   except: # pylint: disable=W0702
     logging.exception('Unrecognized error occurred.')
     return constants.ERROR_EXIT_CODE
 
 
 if __name__ == '__main__':
   sys.exit(main())