[Findit] Reorganizing findit_for_*.py

appengine/findit/crash/component_classifier.py

 # Copyright 2016 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.
 
 from collections import namedtuple
 import logging
 import re
 
-from crash.classifier import Classifier
+from crash.occurrence import RankByOccurrence
 
 
 # TODO(wrengr): write coverage tests the old version was lacking.
 class Component(namedtuple('Component',
     ['component_name', 'path_regex', 'function_regex'])): # pragma: no cover
   """A representation of a "component" in Chromium.
 
   For example: 'Blink>DOM' or 'Blink>HTML'. Notably, a component knows
   how to identify itself. Hence, given a stack frame or change list
   or whatever, we ask the Component whether it matches that frame,
@@ skipping 11 matching lines @@
     if not self.path_regex.match(frame.dep_path + frame.file_path):
       return False
 
     # We interpret function_regex=None to mean the regex that matches
     # everything.
     if not self.function_regex:
       return True
     return self.function_regex.match(frame.function)
 
 
-class ComponentClassifier(Classifier):
+class ComponentClassifier(object):
   """Determines the component of a crash.
 
   For example: ['Blink>DOM', 'Blink>HTML'].
   """
 
   def __init__(self, components, top_n):
     """Build a classifier for components.
 
     Args:
       components (list of crash.component.Component): the components to
@@ skipping 31 matching lines @@
   def Classify(self, results, crash_stack):
     """Classifies project of a crash.
 
     Args:
       results (list of Result): Culprit results.
       crash_stack (CallStack): The callstack that caused the crash.
 
     Returns:
       List of top 2 components.
     """
-    return self._Classify(results, crash_stack, self.top_n, 2)
+    # If |results| are available, we use the components from there since
+    # they're more reliable than the ones from the |crash_stack|.
+    if results:
+      classes = map(self.GetClassFromResult, results[:self.top_n])
+    else:
+      classes = map(self.GetClassFromStackFrame, crash_stack[:self.top_n])
+
+    return RankByOccurrence(classes, 2)