[Telemetry] Move discover to common/py_utils

telemetry/telemetry/record_wpr.py

 # Copyright 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 argparse
 import logging
 import sys
 
 from telemetry import benchmark
 from telemetry import story
-from telemetry.core import discover
 from telemetry.internal.browser import browser_options
 from telemetry.internal.results import results_options
 from telemetry.internal import story_runner
 from telemetry.internal.util import binary_manager
 from telemetry.page import legacy_page_test
 from telemetry.util import matching
 from telemetry.util import wpr_modes
 from telemetry.web_perf import timeline_based_measurement
 from telemetry.web_perf import timeline_based_page_test
 
+from py_utils import discover
 import py_utils
 
 DEFAULT_LOG_FORMAT = (
   '(%(levelname)s) %(asctime)s %(module)s.%(funcName)s:%(lineno)d  '
   '%(message)s')
 
 
 class RecorderPageTest(legacy_page_test.LegacyPageTest):
   def __init__(self):
     super(RecorderPageTest, self).__init__()
@@ skipping 258 matching lines @@
   binary_manager.InitDependencyManager(environment.client_configs)
 
   # TODO(nednguyen): update WprRecorder so that it handles the difference
   # between recording a benchmark vs recording a story better based on
   # the distinction between args.benchmark & args.story
   wpr_recorder = WprRecorder(environment.top_level_dir, target, extra_args)
   results = wpr_recorder.CreateResults()
   wpr_recorder.Record(results)
   wpr_recorder.HandleResults(results, args.upload)
   return min(255, len(results.failures))