[Predator] Pass config as argument to findit.

appengine/findit/util_scripts/crash_queries/delta_test/run-predator.py

Index: appengine/findit/util_scripts/crash_queries/delta_test/run-predator.py
diff --git a/appengine/findit/util_scripts/crash_queries/delta_test/run-predator.py b/appengine/findit/util_scripts/crash_queries/delta_test/run-predator.py
index a40b2ae3517833301fd05009e1a4da883b9bf507..6eb3508f60f65fc7b8441edbf4e5be30a033ef20 100644
--- a/appengine/findit/util_scripts/crash_queries/delta_test/run-predator.py
+++ b/appengine/findit/util_scripts/crash_queries/delta_test/run-predator.py
@@ -33,11 +33,12 @@ _FRACAS_FEEDBACK_URL_TEMPLATE = (
     'https://%s.appspot.com/crash/fracas-result-feedback?key=%s')
 
 
-def StoreResults(crash, client_id, app_id, id_to_culprits, lock, verbose=False):
+def StoreResults(crash, client_id, app_id, id_to_culprits, lock, config,
+                 verbose=False):
   """Stores findit result of crash into id_to_culprits dict."""
   crash_url = _FRACAS_FEEDBACK_URL_TEMPLATE % (app_id, crash['id'])
   try:
-    findit = FinditForClientID(client_id, LocalGitRepository)
+    findit = FinditForClientID(client_id, LocalGitRepository, config)
     stacktrace = findit._stacktrace_parser.Parse(
         crash['stack_trace'],
         ChromeDependencyFetcher(LocalGitRepository.Factory()).GetDependency(
@@ -69,29 +70,21 @@ def GetCulprits(crashes, client_id, app_id, verbose=False):
   """Run predator analysis on crashes locally."""
   # Enable remote access to app engine services.
   remote_api.EnableRemoteApi(app_id)
-  origin_get = CrashConfig.Get
-  try:
-    # This hack is to solve flaky BadStatusLine excepion(crbug.com/666150) in
-    # remote api when key.get() gets called in threads.
-    # TODO(katesonia): Remove this hack after crbug.com/659354 is done.
-    CrashConfig.Get = script_util.GetLockedMethod(CrashConfig, 'Get',
-                                                  threading.Lock())
-    id_to_culprits = {}
-    tasks = []
-    lock = threading.Lock()
-    for crash in crashes:
-      crash['regression_range'] = DetectRegressionRange(
-          crash['historical_metadata'])
-      tasks.append({
-          'function': StoreResults,
-          'args': [crash, client_id, app_id, id_to_culprits, lock],
-          'kwargs': {'verbose': verbose}
-      })
-    script_util.RunTasks(tasks)
-
-    return id_to_culprits
-  finally:
-    CrashConfig.Get = origin_get
+  id_to_culprits = {}
+  tasks = []
+  lock = threading.Lock()
+  config = CrashConfig.Get()
+  for crash in crashes:
+    crash['regression_range'] = DetectRegressionRange(
+        crash['historical_metadata'])
+    tasks.append({
+        'function': StoreResults,
+        'args': [crash, client_id, app_id, id_to_culprits, lock, config],
+        'kwargs': {'verbose': verbose}
+    })
+  script_util.RunTasks(tasks)
+
+  return id_to_culprits
 
 
 def RunPredator():