Merge changes I2407997f,I9386bd66,I6912df70,Iad2ab990,I5786a1ab, ...

* changes:
  gn2bp: Remove code for gen_version_module
  gn2bp: Remove code for proto_descriptor_module
  gn2bp: Remove code for gen_amalgamated_sql_metrics
  gn2bp: Remove TARGET in update_results.sh
  gn2bp: Remove unnecessary conversion for write_native_libraries_java.py
  gn2bp: Remove crbug_908819 related conversion
  gn2bp: Remove unnecessary conversion for grit action
  gn2bp: Remove unnecessary hack for build_config_gen
diff --git a/tools/gn2bp/gn_utils.py b/tools/gn2bp/gn_utils.py
index 8543c12..880a9d0 100644
--- a/tools/gn2bp/gn_utils.py
+++ b/tools/gn2bp/gn_utils.py
@@ -69,6 +69,8 @@
   name = re.sub(r'[^a-zA-Z0-9_]', '_', name)
   return name
 
+def _is_java_source(src):
+  return os.path.splitext(src)[1] == '.java' and not src.startswith("//out/test/gen/")
 
 class GnParser(object):
   """A parser with some cleverness for GN json desc files
@@ -399,8 +401,7 @@
       if re.match(DEX_REGEX, target.name):
         if re.match(COMPILE_JAVA_REGEX, dep.name):
           log.debug('Adding java sources for %s', dep.name)
-          java_srcs = [src for src in dep.inputs
-                       if os.path.splitext(src)[1] == '.java' and not src.startswith("//out/test/gen/")]
+          java_srcs = [src for src in dep.inputs if _is_java_source(src)]
           self.java_sources.update(java_srcs)
 
     return target