[telemetry] Update record_wpr to look for measurements everywhere.

Because https://chromiumcodereview.appspot.com/17438002/ moved smoothness_measurement from perf_tools/ to measurements/.

BUG=None.
TEST=None.
R=tonyg@chromium.org

Review URL: https://codereview.chromium.org/17379021

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207903 0039d316-1c4b-4281-b951-d872f2087c98

tools/perf/record_wpr

@@ -9,5 +9,4 @@ import perf_tools
 from telemetry.page import record_wpr
 
 if __name__ == '__main__':
-  benchmark_dir = os.path.join(os.path.dirname(__file__), 'perf_tools')
-  sys.exit(record_wpr.Main(benchmark_dir))
+  sys.exit(record_wpr.Main(os.path.dirname(__file__)))

tools/telemetry/docs/telemetry.core.timeline.html

@@ -19,12 +19,11 @@
 <tr><td bgcolor="#aa55cc"><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</tt></td><td>&nbsp;</td>
 <td width="100%"><table width="100%" summary="list"><tr><td width="25%" valign=top><a href="telemetry.core.timeline.event.html">event</a><br>
 <a href="telemetry.core.timeline.event_unittest.html">event_unittest</a><br>
-<a href="telemetry.core.timeline.importer.html">importer</a><br>
-</td><td width="25%" valign=top><a href="telemetry.core.timeline.inspector_importer.html">inspector_importer</a><br>
-<a href="telemetry.core.timeline.inspector_importer_unittest.html">inspector_importer_unittest</a><br>
+</td><td width="25%" valign=top><a href="telemetry.core.timeline.importer.html">importer</a><br>
+<a href="telemetry.core.timeline.inspector_importer.html">inspector_importer</a><br>
+</td><td width="25%" valign=top><a href="telemetry.core.timeline.inspector_importer_unittest.html">inspector_importer_unittest</a><br>
 <a href="telemetry.core.timeline.model.html">model</a><br>
 </td><td width="25%" valign=top><a href="telemetry.core.timeline.model_unittest.html">model_unittest</a><br>
-<a href="telemetry.core.timeline.trace_event_importer.html">trace_event_importer</a><br>
 <a href="telemetry.core.timeline.tracing.html"><strong>tracing</strong>&nbsp;(package)</a><br>
-</td><td width="25%" valign=top></td></tr></table></td></tr></table>
+</td></tr></table></td></tr></table>
 </body></html>
\ No newline at end of file

tools/telemetry/docs/telemetry.page.record_wpr.html

@@ -130,6 +130,6 @@ the first run of the test can warm thing
 <font color="#ffffff" face="helvetica, arial"><big><strong>Functions</strong></big></font></td></tr>
     
 <tr><td bgcolor="#eeaa77"><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</tt></td><td>&nbsp;</td>
-<td width="100%"><dl><dt><a name="-Main"><strong>Main</strong></a>(measurement_dir)</dt></dl>
+<td width="100%"><dl><dt><a name="-Main"><strong>Main</strong></a>(base_dir)</dt></dl>
 </td></tr></table>
 </body></html>
\ No newline at end of file

tools/telemetry/telemetry/page/record_wpr.py

@@ -59,10 +59,9 @@ class RecordPage(page_test.PageTest):
     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)
@@ -98,7 +97,7 @@ def Main(measurement_dir):
   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.