[polymer] Merge of master into polymer10-migration

telemetry/telemetry/value/trace.py

 # Copyright 2014 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 datetime
 import json
 import logging
 import os
 import random
 import shutil
@@ skipping 55 matching lines @@
         trace_files.append(file_path)
         counter += 1
       tf = tempfile.NamedTemporaryFile(delete=False, suffix='.html')
       tf.close()
       if trace_files:
         title = ''
         if self.page:
           title = self.page.display_name
         cmd = (['python', _TRACE2HTML_PATH] + trace_files +
                ['--output', tf.name] + ['--title', title])
-        subprocess.check_call(cmd)
+        subprocess.check_output(cmd)
       else:
         logging.warning('No traces to convert to html.')
       return file_handle.FromTempFile(tf)
     finally:
       shutil.rmtree(temp_dir)
 
   def __repr__(self):
     if self.page:
       page_name = self.page.display_name
     else:
@@ skipping 88 matching lines @@
           fh.extension))
       self._cloud_url = cloud_storage.Insert(
           bucket, remote_path, fh.GetAbsPath())
       sys.stderr.write(
           'View generated trace files online at %s for page %s\n' %
           (self._cloud_url, self.page.url if self.page else 'unknown'))
       return self._cloud_url
     except cloud_storage.PermissionError as e:
       logging.error('Cannot upload trace files to cloud storage due to '
                     ' permission error: %s' % e.message)