[telemetry] Update record_wpr to look for measurements everywhere.

tools/telemetry/telemetry/page/record_wpr.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.
 import logging
 import os
 import sys
 import tempfile
 import time
 
@@ skipping 41 matching lines @@
 
   def _CompoundActionsForPage(self, page):
     actions = []
     for action_name in self._action_names:
       if not hasattr(page, action_name):
         continue
       actions.append(page_test.GetCompoundActionFromPage(page, action_name))
     return actions
 
 
-def Main(measurement_dir):
-  measurements = discover.DiscoverClasses(measurement_dir,
-                                        os.path.join(measurement_dir, '..'),
-                                        page_measurement.PageMeasurement)
+def Main(base_dir):
+  measurements = discover.DiscoverClasses(base_dir, base_dir,
+                                          page_measurement.PageMeasurement)
   options = browser_options.BrowserOptions()
   parser = options.CreateParser('%prog <page_set>')
   page_runner.AddCommandLineOptions(parser)
 
   recorder = RecordPage(measurements)
   recorder.AddCommandLineOptions(parser)
   recorder.AddOutputOptions(parser)
 
   _, args = parser.parse_args()
 
@@ skipping 15 matching lines @@
 
   if results.errors or results.failures:
     logging.warning('Some pages failed. The recording has not been updated for '
                     'these pages.')
     logging.warning('Failed pages:\n%s',
                     '\n'.join(zip(*results.errors + results.failures)[0]))
 
   if results.skipped:
     logging.warning('Some pages were skipped. The recording has not been '
                     'updated for these pages.')
-    logging.warning('Skipped pages:\n%s', '\n'.join(results.skipped))
+    logging.warning('Skipped pages:\n%s', '\n'.join(zip(*results.skipped)[0]))
 
   if results.successes:
     # Update the metadata for the pages which were recorded.
     ps.wpr_archive_info.AddRecordedPages(results.successes)
   else:
     os.remove(temp_target_wpr_file_path)
 
   return min(255, len(results.failures))