Adds uploading picture benchmark JSON data

slave/skia_slave_scripts/bench_pictures.py

 #!/usr/bin/env python
 # Copyright (c) 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.
 
 """ Run the Skia bench_pictures executable. """
 
+import os
+import sys
+
 from build_step import BuildStep
 from run_bench import BenchArgs
-import os
-import sys
+from utils import gclient_utils
 
 
 BENCH_REPEAT_COUNT = 10
 
 
 class BenchPictures(BuildStep):
   def __init__(self, timeout=16800, no_output_timeout=16800, **kwargs):
     super(BenchPictures, self).__init__(timeout=timeout,
                                         no_output_timeout=no_output_timeout,
                                         **kwargs)
 
   # pylint: disable=W0221
   def _BuildDataFile(self, args):
     filename = '_'.join(['bench', self._got_revision,
                          'data', 'skp'] + args)
     full_path = os.path.join(self._device_dirs.PerfDir(),
         filename.replace('-', '').replace(':', '-'))
     return full_path
 
+  def _BuildJSONDataFile(self, args):
+    git_timestamp = gclient_utils.GetGitRepoPOSIXTimestamp()
+    return '{}_{}.json'.format(
+        self._BuildDataFile(args),
+        git_timestamp)
+
   def _DoBenchPictures(self, args):
     arguments = ['-r', self._device_dirs.SKPDir()] + args
     if self._perf_data_dir:
       arguments.extend(BenchArgs(data_file=self._BuildDataFile(args)))
+      arguments.extend(['--jsonLog', self._BuildJSONDataFile(args)])
       # For bench_pictures we use the --repeat and --logPerIter flags so that we
       # can compensate for noisy performance.
       arguments.extend(['--repeat', str(BENCH_REPEAT_COUNT), '--logPerIter'])
     self._flavor_utils.RunFlavoredCmd('bench_pictures', arguments)
 
   def _Run(self):
     # Determine which configs to run
     if self._configuration == 'Debug':
       cfg_name = 'debug'
     else:
@@ skipping 26 matching lines @@
         self._DoBenchPictures(args)
       except Exception as e:
         print e
         errors.append(e)
     if errors:
       raise errors[0]
 
 
 if '__main__' == __name__:
   sys.exit(BuildStep.RunBuildStep(BenchPictures))