Change PRESUBMIT.py to make sure the right FlakyTest being used

PRESUBMIT.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.
 
 """Top-level presubmit script for Chromium.
 
 See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
 for more details about the presubmit API built into depot_tools.
 """
 
@@ skipping 453 matching lines @@
         if not histogram_name_found:
           problems.append(' [%s:%d] %s' %
                           (f.LocalPath(), line_num, histogram_name))
 
   if not problems:
     return []
   return [output_api.PresubmitPromptWarning('Some UMA_HISTOGRAM lines have '
     'been modified and the associated histogram name has no match in either '
     '%s or the modifications of it:' % (histograms_xml_path),  problems)]
 
+def _CheckFlakyTestUsage(input_api, output_api):
+  """Check that FlakyTest annotation is our own instead of the android one"""
+  pattern = input_api.re.compile(r'import android.test.FlakyTest;')
+  files = []
+  for f in input_api.AffectedSourceFiles(input_api.FilterSourceFile):
+    if (f.LocalPath().endswith('Test.java')):

[rnephew (Reviews Here), 2016/04/11 18:58:26]

nit: 
 if (f.LocalPath().endswith('Test.java')):
into:
 if f.LocalPath().endswith('Test.java'):

[Yoland Yan(Google), 2016/04/11 19:03:44]

Done.

+        contents = input_api.ReadFile(f)
+        if pattern.search(contents):

[rnephew (Reviews Here), 2016/04/11 18:58:26]

Since contents isn't used elsewhere, you could probably just do:
         if pattern.search(input_api.ReadFile(f)):

[Yoland Yan(Google), 2016/04/11 19:03:44]

Done.

+          files.append(f)
+  if len(files):
+    return [ output_api.PresubmitError(

[rnephew (Reviews Here), 2016/04/11 18:56:30]

nit: [output_api...

[Yoland Yan(Google), 2016/04/11 19:03:44]

Done.

+      'Use org.chromium.base.test.util.FlakyTest instead of ' +

[rnephew (Reviews Here), 2016/04/11 18:56:30]

nit: 4 space indentation.

no need for + here. This could just be:
    'Use org.chromium.base.test.util.FlakyTest instead of '
    'android.test.FlakyTest',

[Yoland Yan(Google), 2016/04/11 19:03:44]

Done.

+      'android.test.FlakyTest',
+      files) ]

[rnephew (Reviews Here), 2016/04/11 18:56:30]

nit: files)]

[Yoland Yan(Google), 2016/04/11 19:03:44]

Done.

+  return []
 
 def _CheckNoNewWStrings(input_api, output_api):
   """Checks to make sure we don't introduce use of wstrings."""
   problems = []
   for f in input_api.AffectedFiles():
     if (not f.LocalPath().endswith(('.cc', '.h')) or
         f.LocalPath().endswith(('test.cc', '_win.cc', '_win.h')) or
         '/win/' in f.LocalPath()):
       continue
 
@@ skipping 1303 matching lines @@
   results.extend(_CheckUnwantedDependencies(input_api, output_api))
   results.extend(_CheckFilePermissions(input_api, output_api))
   results.extend(_CheckNoAuraWindowPropertyHInHeaders(input_api, output_api))
   results.extend(_CheckIncludeOrder(input_api, output_api))
   results.extend(_CheckForVersionControlConflicts(input_api, output_api))
   results.extend(_CheckPatchFiles(input_api, output_api))
   results.extend(_CheckHardcodedGoogleHostsInLowerLayers(input_api, output_api))
   results.extend(_CheckNoAbbreviationInPngFileName(input_api, output_api))
   results.extend(_CheckForInvalidOSMacros(input_api, output_api))
   results.extend(_CheckForInvalidIfDefinedMacros(input_api, output_api))
+  results.extend(_CheckFlakyTestUsage(input_api, output_api))
   # TODO(danakj): Remove this when base/move.h is removed.
   results.extend(_CheckForUsingPass(input_api, output_api))
   results.extend(_CheckAddedDepsHaveTargetApprovals(input_api, output_api))
   results.extend(
       input_api.canned_checks.CheckChangeHasNoTabs(
           input_api,
           output_api,
           source_file_filter=lambda x: x.LocalPath().endswith('.grd')))
   results.extend(_CheckSpamLogging(input_api, output_api))
   results.extend(_CheckForAnonymousVariables(input_api, output_api))
@@ skipping 282 matching lines @@
   results.extend(input_api.canned_checks.CheckTreeIsOpen(
       input_api,
       output_api,
       json_url='http://chromium-status.appspot.com/current?format=json'))
 
   results.extend(input_api.canned_checks.CheckChangeHasBugField(
       input_api, output_api))
   results.extend(input_api.canned_checks.CheckChangeHasDescription(
       input_api, output_api))
   return results