Refactor dmprof: remove no_dump flag for 'buckets' in load_basic_files.

tools/deep_memory_profiler/lib/subcommand.py

 # Copyright 2013 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 logging
 import optparse
 import os
 import re
 
 from lib.bucket import BucketSet
@@ skipping 13 matching lines @@
   """Subclasses are a subcommand for this executable.
 
   See COMMANDS in main() in dmprof.py.
   """
   _DEVICE_BINDIRS = ['/data/data/', '/data/app-lib/', '/data/local/tmp']
 
   def __init__(self, usage):
     self._parser = optparse.OptionParser(usage)
 
   @staticmethod
-  def load_basic_files(
-      dump_path, multiple, no_dump=False, alternative_dirs=None):
+  def load_basic_files(dump_path, multiple, alternative_dirs=None):
     prefix = SubCommand._find_prefix(dump_path)
     # If the target process is estimated to be working on Android, converts
     # a path in the Android device to a path estimated to be corresponding in
     # the host.  Use --alternative-dirs to specify the conversion manually.
     if not alternative_dirs:
       alternative_dirs = SubCommand._estimate_alternative_dirs(prefix)
     if alternative_dirs:
       for device, host in alternative_dirs.iteritems():
         LOGGER.info('Assuming %s on device as %s on host' % (device, host))
     symbol_data_sources = SymbolDataSources(prefix, alternative_dirs)
     symbol_data_sources.prepare()
     bucket_set = BucketSet()
     bucket_set.load(prefix)
-    if not no_dump:
-      if multiple:
-        dump_list = DumpList.load(SubCommand._find_all_dumps(dump_path))
-      else:
-        dump = Dump.load(dump_path)
+    if multiple:
+      dump_list = DumpList.load(SubCommand._find_all_dumps(dump_path))
+    else:
+      dump = Dump.load(dump_path)
     symbol_mapping_cache = SymbolMappingCache()
     with open(prefix + '.cache.function', 'a+') as cache_f:
       symbol_mapping_cache.update(
           FUNCTION_SYMBOLS, bucket_set,
           SymbolFinder(FUNCTION_SYMBOLS, symbol_data_sources), cache_f)
     with open(prefix + '.cache.typeinfo', 'a+') as cache_f:
       symbol_mapping_cache.update(
           TYPEINFO_SYMBOLS, bucket_set,
           SymbolFinder(TYPEINFO_SYMBOLS, symbol_data_sources), cache_f)
     with open(prefix + '.cache.sourcefile', 'a+') as cache_f:
       symbol_mapping_cache.update(
           SOURCEFILE_SYMBOLS, bucket_set,
           SymbolFinder(SOURCEFILE_SYMBOLS, symbol_data_sources), cache_f)
     bucket_set.symbolize(symbol_mapping_cache)
-    if no_dump:
-      return bucket_set
-    elif multiple:
+    if multiple:
       return (bucket_set, dump_list)
     else:
       return (bucket_set, dump)
 
   @staticmethod
   def _find_prefix(path):
     return re.sub('\.[0-9][0-9][0-9][0-9]\.heap', '', path)
 
   @staticmethod
   def _estimate_alternative_dirs(prefix):
@@ skipping 70 matching lines @@
       self._parser.error('needs %d argument(s).\n' % required)
       return None
     return (options, args)
 
   @staticmethod
   def _parse_policy_list(options_policy):
     if options_policy:
       return options_policy.split(',')
     else:
       return None