Make Progress support an arbitrary number of columns.

tools/run_swarm_tests_on_swarm.py

 #!/usr/bin/env python
 # 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.
 
 """Runs the whole set unit tests on swarm."""
 
 import datetime
 import glob
 import getpass
@@ skipping 122 matching lines @@
       self.progress.update_item(
           'Failed %s:\n%s' % (step_name, stdout), index=1)
       return (test_name, platform, stdout)
     self.progress.update_item('Passed %s' % step_name, index=1)
     return None
 
 
 def run_swarm_tests_on_swarm(oses, tests, logs, isolate_server, swarm_server):
   runs = len(tests) * len(oses)
   total = 3 * runs
-  progress = threading_utils.Progress(total)
+  columns = [('index', 0), ('size', total)]
+  progress = threading_utils.Progress(columns)
   progress.use_cr_only = False
   tempdir = tempfile.mkdtemp(prefix='swarm_client_tests')
   try:
     with threading_utils.ThreadPoolWithProgress(
         progress, runs, runs, total) as pool:
       start = time.time()
       runner = Runner(
           isolate_server, swarm_server, pool.add_task, progress, tempdir)
       for test in tests:
         for platform in oses:
@@ skipping 85 matching lines @@
   return run_swarm_tests_on_swarm(
       oses,
       tests,
       options.logs,
       options.isolate_server,
       options.swarming)
 
 
 if __name__ == '__main__':
   sys.exit(main())