sandwich: Merge cache-validation.json and urls-for-resources.json tasks

tools/android/loading/sandwich_metrics.py

 # 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.
 
 """Pull a sandwich run's output directory's metrics from traces into a CSV.
 
 python pull_sandwich_metrics.py -h
 """
 
 import collections
@@ skipping 117 matching lines @@
     if event.category != 'blink.user_timing':
       continue
     event_name = event.name
 
     # Find the id of the main frame. Skip all events until it is found.
     if not main_frame_id:
       # Tracing (in Sandwich) is started after about:blank is fully loaded,
       # hence the first navigationStart in the trace registers the correct frame
       # id.
       if event_name == 'navigationStart':
-        logging.info('Found navigationStart at: %f', event.start_msec)
+        logging.info('  Found navigationStart at: %f', event.start_msec)
         main_frame_id = event.args['frame']
       continue
 
     # Ignore events with frame id attached, but not being the main frame.
     if 'frame' in event.args and event.args['frame'] != main_frame_id:
       continue
 
     # Capture trace events by the first time of their appearance. Note: some
     # important events (like requestStart) do not have a frame id attached.
     if event_name in _TRACKED_EVENT_NAMES and event_name not in tracked_events:
       tracked_events[event_name] = event
-      logging.info('Event %s first appears at: %f', event_name,
+      logging.info('  Event %s first appears at: %f', event_name,
           event.start_msec)
   return tracked_events
 
 
 def _ExtractDefaultMetrics(loading_trace):
   """Extracts all the default metrics from a given trace.
 
   Args:
     loading_trace: loading_trace.LoadingTrace.
 
@@ skipping 140 matching lines @@
     except video.BoundingBoxNotFoundException:
       # Sometimes the bounding box for the web content area is not present. Skip
       # calculating Speed Index.
       run_metrics['speed_index'] = _FAILED_CSV_VALUE
   else:
     run_metrics['speed_index'] = _UNAVAILABLE_CSV_VALUE
   for key, value in trace.metadata['network_emulation'].iteritems():
     run_metrics['net_emul.' + key] = value
   assert set(run_metrics.keys()) == set(COMMON_CSV_COLUMN_NAMES)
   return run_metrics