Fix a bug introduced in a refactor to the ELFSymbolizer.

tracing/bin/symbolize_trace

 #!/usr/bin/env python
 # 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.
 
 import argparse
 import bisect
 import collections
 import gzip
 import json
@@ skipping 47 matching lines @@
   # Encapsulates platform-specific symbolization logic.
   def __init__(self):
     self.is_mac = sys.platform == 'darwin'
     if self.is_mac:
       self.binary = 'atos'
       self._matcher = symbolize_trace_atos_regex.AtosRegexMatcher()
     else:
       self.binary = 'addr2line'
     self.symbolizer_path = FindInSystemPath(self.binary)
 
-  def _SymbolizeLinuxAndAndroid(self, symfile):
+  def _SymbolizeLinuxAndAndroid(self, symfile, unsymbolized_name):
     def _SymbolizerCallback(sym_info, frames):
       # Unwind inline chain to the top.
       while sym_info.inlined_by:
         sym_info = sym_info.inlined_by
 
       symbolized_name = sym_info.name if sym_info.name else unsymbolized_name
       for frame in frames:
         frame.name = symbolized_name
 
     symbolizer = elf_symbolizer.ELFSymbolizer(symfile.symbolizable_path,
@@ skipping 32 matching lines @@
 
       cmd = list(cmd_base)
       cmd.extend([hex(int(x)) for x in keys_to_process])
       output_array = subprocess.check_output(cmd).split('\n')
       for i in range(len(keys_to_process)):
         for frame in symfile.frames_by_address.values()[i + processed_keys_count]:
           frame.name = self._matcher.Match(output_array[i])
       processed_keys_count += len(keys_to_process)
       all_keys = all_keys[input_count:]
 
-  def Symbolize(self, symfile):
+  def Symbolize(self, symfile, unsymbolized_name):
     if self.is_mac:
       self._SymbolizeMac(symfile)
     else:
-      self._SymbolizeLinuxAndAndroid(symfile)
+      self._SymbolizeLinuxAndAndroid(symfile, unsymbolized_name)
 
 
 def IsSymbolizableFile(file_path):
   result = subprocess.check_output(['file', '-0', file_path])
   type_string = result[result.find('\0') + 1:]
   return bool(re.match(r'.*(ELF|Mach-O) (32|64)-bit\b.*',
               type_string, re.DOTALL))
 
 
 class ProcessMemoryMaps(object):
@@ skipping 236 matching lines @@
                  problem)
       for frames in symfile.frames_by_address.itervalues():
         for frame in frames:
           frame.name = unsymbolized_name
       continue
 
     _SubPrintf('Symbolizing {} PCs from {}...',
                len(symfile.frames_by_address),
                symfile.path)
 
-    symbolizer.Symbolize(symfile)
+    symbolizer.Symbolize(symfile, unsymbolized_name)
     symbolized = True
 
   return symbolized
 
 
 def HaveFilesFromAndroid(symfiles):
   return any(ANDROID_PATH_MATCHER.match(f.path) for f in symfiles)
 
 
 def RemapAndroidFiles(symfiles, output_path):
@@ skipping 60 matching lines @@
 
     print 'Updating trace file...'
     with _OpenTraceFile('w') as trace_file:
       json.dump(trace, trace_file)
   else:
     print 'No PCs symbolized - not updating trace file.'
 
 
 if __name__ == '__main__':
   main()