Refactoring JavaScript modal dialog.

build/android/pylib/apk_info.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.
 
 """Gathers information about APKs."""
 
 import collections
 import logging
 import os
 import pickle
@@ skipping 77 matching lines @@
     method = None
     annotation = None
     has_value = False
     qualified_method = None
     for line in proguard_output:
       m = self._PROGUARD_CLASS_RE.match(line)
       if m:
         clazz = m.group(1).replace('/', '.')  # Change package delim.
         annotation = None
         continue
+
       m = self._PROGUARD_METHOD_RE.match(line)
       if m:
         method = m.group(1)
         annotation = None
         qualified_method = clazz + '#' + method
         if method.startswith('test') and clazz.endswith('Test'):
           self._test_methods += [qualified_method]
         continue
+
+      if not qualified_method:
+        # Ignore non-method annotations.
+        continue
+
       m = self._PROGUARD_ANNOTATION_RE.match(line)
       if m:
-        assert qualified_method
         annotation = m.group(1).split('/')[-1]  # Ignore the annotation package.
         self._annotation_map[qualified_method].append(annotation)
         has_value = False
         continue
       if annotation:
-        assert qualified_method
         if not has_value:
           m = self._PROGUARD_ANNOTATION_CONST_RE.match(line)
           if m:
             has_value = True
         else:
           m = self._PROGUARD_ANNOTATION_VALUE_RE.match(line)
           if m:
             value = m.group(1)
             self._annotation_map[qualified_method].append(
                 annotation + ':' + value)
@@ skipping 48 matching lines @@
             if self._IsTestMethod(test) and self._AnnotationsMatchFilters(
                 annotation_filter_list, annotations)]
 
   def GetTestMethods(self):
     """Returns a list of all test methods in this apk as Class#testMethod."""
     return self._test_methods
 
   @staticmethod
   def IsPythonDrivenTest(test):
     return 'pythonDrivenTests' in test