Index: gm/rebaseline_server/compare_to_expectations.py |
diff --git a/gm/rebaseline_server/compare_to_expectations.py b/gm/rebaseline_server/compare_to_expectations.py |
index e9677bdcb88912a3f0f85d0be24fcc764244a265..86e2654c6f1be14ea2a1b044bbc9cc3be9bec227 100755 |
--- a/gm/rebaseline_server/compare_to_expectations.py |
+++ b/gm/rebaseline_server/compare_to_expectations.py |
@@ -21,10 +21,6 @@ import time |
# Imports from within Skia |
# |
-# TODO(epoger): Once we move the create_filepath_url() function out of |
-# download_actuals into a shared utility module, we won't need to import |
-# download_actuals anymore. |
-# |
# We need to add the 'gm' directory, so that we can import gm_json.py within |
# that directory. That script allows us to parse the actual-results.json file |
# written out by the GM tool. |
@@ -35,12 +31,12 @@ GM_DIRECTORY = os.path.dirname(PARENT_DIRECTORY) |
TRUNK_DIRECTORY = os.path.dirname(GM_DIRECTORY) |
if GM_DIRECTORY not in sys.path: |
sys.path.append(GM_DIRECTORY) |
-import download_actuals |
import gm_json |
import imagediffdb |
import imagepair |
import imagepairset |
import results |
+import url_utils |
EXPECTATION_FIELDS_PASSED_THRU_VERBATIM = [ |
results.KEY__EXPECTATIONS__BUGS, |
@@ -88,7 +84,7 @@ class ExpectationComparisons(results.BaseComparisons): |
self._image_diff_db = imagediffdb.ImageDiffDB(generated_images_root) |
self._diff_base_url = ( |
diff_base_url or |
- download_actuals.create_filepath_url(generated_images_root)) |
+ url_utils.create_filepath_url(generated_images_root)) |
self._actuals_root = actuals_root |
self._expected_root = expected_root |
self._ignore_failures_on_these_tests = [] |