[Android] Refactor md5_check + add tests

build/android/gyp/jar_toc.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.
 
 """Creates a TOC file from a Java jar.
 
 The TOC file contains the non-package API of the jar. This includes all
 public/protected classes/functions/members and the values of static final
@@ skipping 63 matching lines @@
   javap_output = CallJavap(classpath=jar_path, classes=classes)
   toc = ExtractToc(javap_output)
 
   with open(toc_path, 'w') as tocfile:
     tocfile.write(toc)
 
 
 def DoJarToc(options):
   jar_path = options.jar_path
   toc_path = options.toc_path
-  md5_stamp_path = '%s.md5' % toc_path
-  md5_checker = md5_check.Md5Checker(stamp=md5_stamp_path, inputs=[jar_path])
-  if md5_checker.IsStale():
-    UpdateToc(jar_path, toc_path)
-    md5_checker.Write()
-  else:
-    build_utils.Touch(toc_path)
+  record_path = '%s.md5.stamp' % toc_path
+  md5_check.CallAndRecordIfStale(
+      lambda: UpdateToc(jar_path, toc_path),
+      record_path=record_path,
+      input_paths=[jar_path],
+      )
+  build_utils.Touch(toc_path)
 
 
 def main(argv):
   parser = optparse.OptionParser()
   parser.add_option('--jar-path', help='Input .jar path.')
   parser.add_option('--toc-path', help='Output .jar.TOC path.')
   parser.add_option('--stamp', help='Path to touch on success.')
 
   # TODO(newt): remove this once http://crbug.com/177552 is fixed in ninja.
   parser.add_option('--ignore', help='Ignored.')
 
   options, _ = parser.parse_args()
 
   DoJarToc(options)
 
   if options.stamp:
     build_utils.Touch(options.stamp)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))