Revert of Enable presubmit pylint in build/android.

build/android/pylib/instrumentation/test_jar.py

 # Copyright (c) 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.
 
 """Helper class for instrumenation test jar."""
-# pylint: disable=W0702
 
 import collections
 import logging
 import os
 import pickle
 import re
 
 from pylib import cmd_helper
 from pylib import constants
 
@@ skipping 104 matching lines @@
     logging.info('Storing proguard output to %s', self._pickled_proguard_name)
     d = {'VERSION': PICKLE_FORMAT_VERSION,
          'ANNOTATION_MAP': self._annotation_map,
          'TEST_METHODS': self._test_methods}
     with open(self._pickled_proguard_name, 'w') as f:
       f.write(pickle.dumps(d))
 
   def _GetAnnotationMap(self):
     return self._annotation_map
 
-  @staticmethod
-  def _IsTestMethod(test):
+  def _IsTestMethod(self, test):
     class_name, method = test.split('#')
     return class_name.endswith('Test') and method.startswith('test')
 
   def GetTestAnnotations(self, test):
     """Returns a list of all annotations for the given |test|. May be empty."""
     if not self._IsTestMethod(test):
       return []
     return self._GetAnnotationMap()[test]
 
-  @staticmethod
-  def _AnnotationsMatchFilters(annotation_filter_list, annotations):
+  def _AnnotationsMatchFilters(self, annotation_filter_list, annotations):
     """Checks if annotations match any of the filters."""
     if not annotation_filter_list:
       return True
     for annotation_filter in annotation_filter_list:
       filters = annotation_filter.split('=')
       if len(filters) == 2:
         key = filters[0]
         value_list = filters[1].split(',')
         for value in value_list:
           if key + ':' + value in annotations:
@@ skipping 15 matching lines @@
   def _GetTestsMissingAnnotation(self):
     """Get a list of test methods with no known annotations."""
     tests_missing_annotations = []
     for test_method in self.GetTestMethods():
       annotations_ = frozenset(self.GetTestAnnotations(test_method))
       if (annotations_.isdisjoint(self._ANNOTATIONS) and
           not self.IsHostDrivenTest(test_method)):
         tests_missing_annotations.append(test_method)
     return sorted(tests_missing_annotations)
 
-  def GetAllMatchingTests(self, annotation_filter_list,
+  def _GetAllMatchingTests(self, annotation_filter_list,
                            exclude_annotation_list, test_filter):
     """Get a list of tests matching any of the annotations and the filter.
 
     Args:
       annotation_filter_list: List of test annotations. A test must have at
         least one of these annotations. A test without any annotations is
         considered to be SmallTest.
       exclude_annotation_list: List of test annotations. A test must not have
         any of these annotations.
       test_filter: Filter used for partial matching on the test method names.
@@ skipping 24 matching lines @@
       tests = [t for t in available_tests
                if filter_without_hash in t.replace('#', '.')]
     else:
       tests = available_tests
 
     return tests
 
   @staticmethod
   def IsHostDrivenTest(test):
     return 'pythonDrivenTests' in test